Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasKaminsky committed Mar 15, 2024
2 parents 81c5499 + 1fcc0d3 commit a1285ec
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
repository: ${{ steps.get-vars.outputs.repo }}
ref: ${{ steps.get-vars.outputs.branch }}
- name: Set up JDK 17
uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "temurin"
java-version: 17
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
with:
languages: ${{ matrix.language }}
- name: Set up JDK 17
uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "temurin"
java-version: 17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,11 @@ public void onReceivedError(WebView view, WebResourceRequest request, WebResourc

@Override
public boolean shouldOverrideUrlLoading(WebView view, WebResourceRequest request) {
DisplayUtils.startLinkIntent(self, request.getUrl());
return true;
if (!request.isRedirect()) {
DisplayUtils.startLinkIntent(self, request.getUrl());
return true;
}
return false;
}
});

Expand Down

0 comments on commit a1285ec

Please sign in to comment.