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

nextcloud · May 22, 2024 · 5fb326d · 5fb326d
2 parents 5b7d6a2 + 4be4841
commit 5fb326d
Show file tree

Hide file tree

Showing 19 changed files with 315 additions and 399 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/init@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -53,4 +53,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/analyze@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -42,6 +42,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
         with:
           sarif_file: results.sarif
diff --git a/app/build.gradle b/app/build.gradle
@@ -303,7 +303,7 @@ dependencies {
     implementation 'commons-io:commons-io:2.16.1'
     implementation 'org.greenrobot:eventbus:3.3.1'
     implementation 'com.googlecode.ez-vcard:ez-vcard:0.12.1'
-    implementation 'org.lukhnos:nnio:0.3'
+    implementation 'org.lukhnos:nnio:0.3.1'
     implementation 'org.bouncycastle:bcpkix-jdk18on:1.78.1'
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'com.github.nextcloud-deps:sectioned-recyclerview:0.6.1'

diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -143,6 +143,9 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleEventObserver;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import de.cotech.hw.fido.WebViewFidoBridge;
 import de.cotech.hw.fido.ui.FidoDialogOptions;
 import de.cotech.hw.fido2.WebViewWebauthnBridge;
@@ -360,10 +363,18 @@ protected void onCreate(Bundle savedInstanceState) {
         }
 
         initServerPreFragment(savedInstanceState);
+        ProcessLifecycleOwner.get().getLifecycle().addObserver(lifecycleEventObserver);
 
         // webViewUtil.checkWebViewVersion();
     }
 
+    private final LifecycleEventObserver lifecycleEventObserver = ((lifecycleOwner, event) -> {
+        if (event == Lifecycle.Event.ON_START && token != null) {
+            Log_OC.d(TAG, "Start poolLogin");
+            poolLogin(clientFactory.createPlainClient());
+        }
+    });
+
     private void deleteCookies() {
         try {
             CookieSyncManager.createInstance(this);
@@ -403,7 +414,8 @@ private void anonymouslyPostLoginRequest(String url) {
             String loginUrl = login;
             runOnUiThread(() -> {
                 Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(loginUrl));
-                loginFlowResultLauncher.launch(intent);
+                intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(intent);
             });
 
             token = jsonObject.getAsJsonObject("poll").get("token").getAsString();
@@ -412,9 +424,6 @@ private void anonymouslyPostLoginRequest(String url) {
         thread.start();
     }
 
-    private final ActivityResultLauncher<Intent> loginFlowResultLauncher = registerForActivityResult(
-        new ActivityResultContracts.StartActivityForResult(), result -> poolLogin(clientFactory.createPlainClient()));
-
     private static String getWebLoginUserAgent() {
         return Build.MANUFACTURER.substring(0, 1).toUpperCase(Locale.getDefault()) +
             Build.MANUFACTURER.substring(1).toLowerCase(Locale.getDefault()) + " " + Build.MODEL + " (Android)";
@@ -828,6 +837,8 @@ protected void onDestroy() {
             mOperationsServiceBinder = null;
         }
 
+        Log_OC.d(TAG, "AuthenticatorActivity onDestroy called");
+
         super.onDestroy();
     }
 
@@ -1039,6 +1050,7 @@ private void initLoginInfoView() {
 
         cancelButton.setOnClickListener(v -> {
             loginFlowExecutorService.shutdown();
+            ProcessLifecycleOwner.get().getLifecycle().removeObserver(lifecycleEventObserver);
             recreate();
         });
     }
@@ -1638,7 +1650,7 @@ public void onServiceDisconnected(ComponentName component) {
     private boolean isRedirectedToTheDefaultBrowser = false;
 
     private void poolLogin(PlainClient client) {
-        loginFlowExecutorService.scheduleAtFixedRate(() -> {
+        loginFlowExecutorService.scheduleWithFixedDelay(() -> {
             if (!isLoginProcessCompleted) {
                 performLoginFlowV2(client);
             }
@@ -1694,6 +1706,7 @@ private void completeLoginFlow(String response, int status) {
 
         checkOcServer();
         loginFlowExecutorService.shutdown();
+        ProcessLifecycleOwner.get().getLifecycle().removeObserver(lifecycleEventObserver);
     }
 
     /**

diff --git a/app/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java b/app/src/main/java/com/owncloud/android/ui/components/CustomViewPager.java