mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-19 15:33:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2024-03-15 03:42:21 +01:00
commit a1285ec600
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/analysis.yml vendored
View file

@ -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

2
.github/workflows/codeql.yml vendored
View file

@ -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

7
app/src/main/java/com/owncloud/android/ui/activity/ExternalSiteWebView.java
View file

@ -156,8 +156,11 @@ public class ExternalSiteWebView extends FileActivity {
@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;
}
});