Merge branch 'master' into feat/unified-share

Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>

Author: alperozturk96

app/build.gradle.kts

@@ -376,6 +376,7 @@ dependencies {
 
     // region UI
     implementation(libs.bundles.ui)
+    implementation(libs.browser)
     // endregion
 
     // region Worker

app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -67,7 +67,6 @@
 import com.nextcloud.operations.PostMethod;
 import com.nextcloud.utils.extensions.BundleExtensionsKt;
 import com.nextcloud.utils.mdm.MDMConfig;
-import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.AccountSetupBinding;
@@ -128,6 +127,8 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.app.ActionBar;
+import androidx.browser.auth.AuthTabIntent;
+import androidx.core.content.ContextCompat;
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
@@ -492,20 +493,30 @@ private void launchDefaultWebBrowser(String url) {
             return;
         }
 
+        Uri uri = Uri.parse(url);
+        String loginScheme = getString(R.string.login_data_own_scheme);
+
         try {
-            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            PackageManager packageManager = getPackageManager();
+            int toolbarColor = ContextCompat.getColor(this, R.color.primary);
+            AuthTabIntent authTabIntent = new AuthTabIntent.Builder().setColorScheme(toolbarColor).build();
+            authTabIntent.launch(authTabResultLauncher, uri, loginScheme);
+            return;
+        } catch (Exception e) {
+            Log_OC.e(TAG, "Auth Tab login URL launch failed: " + e);
+        }
 
+        try {
+            Intent intent = new Intent(Intent.ACTION_VIEW, uri);
+            PackageManager packageManager = getPackageManager();
             if (intent.resolveActivity(packageManager) != null) {
                 startActivity(intent);
-            } else {
-                DisplayUtils.showSnackMessage(this, R.string.authenticator_activity_no_web_browser_found);
+                return;
             }
         } catch (Exception e) {
-            Log_OC.e(TAG, "Exception launchDefaultWebBrowser: " + e);
-            DisplayUtils.showSnackMessage(this, R.string.authenticator_activity_login_error);
+            Log_OC.e(TAG, "External browser launch failed: " + e);
         }
+
+        DisplayUtils.showSnackMessage(this, R.string.authenticator_activity_no_web_browser_found);
     }
 
     private Pair<String, String> extractPollUrlAndToken() {
@@ -1558,6 +1569,11 @@ private void startQRScanner() {
         qrScanResultLauncher.launch(intent);
     }
 
+    private final ActivityResultLauncher<Intent> authTabResultLauncher = AuthTabIntent.registerActivityResultLauncher(
+        this,
+        result -> Log_OC.d(TAG, "Auth Tab result code: " + result.resultCode)
+    );
+
     private final ActivityResultLauncher<Intent> qrScanResultLauncher = registerForActivityResult(
         new ActivityResultContracts.StartActivityForResult(),
         result -> {

app/src/main/java/com/owncloud/android/operations/DownloadFileOperation.java

@@ -203,7 +203,7 @@ protected RemoteOperationResult run(OwnCloudClient client) {
         downloadOperation = new DownloadFileRemoteOperation(file.getRemotePath(), tmpFolder);
 
         if (downloadType == DownloadType.DOWNLOAD) {
-            dataTransferListeners.forEach(downloadOperation::addDatatransferProgressListener);
+            dataTransferListeners.forEach(downloadOperation::addProgressListener);
         }
 
         NextcloudClient nextcloudClient = OwnCloudClientExtensionsKt.toNextcloudClient(client, operationContext);

app/src/main/res/values-et-rEE/strings.xml

@@ -132,6 +132,7 @@
     <string name="autoupload_hide_folder">Peida kaust</string>
     <string name="avatar">Avatar</string>
     <string name="away">Eemal</string>
+    <string name="backup_list_adapter_local_contacts">Kohalikud kontaktid</string>
     <string name="backup_settings">Varunduse seadistused</string>
     <string name="backup_title">Kontaktide ja kalendri varundus</string>
     <string name="battery_optimization_close">Sulge</string>
@@ -500,6 +501,7 @@
     <string name="filedetails_download">Laadi alla</string>
     <string name="filedetails_export">Ekspordi</string>
     <string name="filedetails_renamed_in_upload_msg">Üleslaadimisel failinimi muutus: „%1$s“</string>
+    <string name="filedetails_sync_all_files">Sünkrooni kõik</string>
     <string name="filedetails_sync_file">Sünkrooni</string>
     <string name="filedisplay_no_file_selected">Faile ei ole valitud</string>
     <string name="filename_empty">Failinimi ei tohi olla tühi</string>
@@ -992,6 +994,8 @@
     <string name="subtitle_videos_only">Vaid videod</string>
     <string name="suggest">Soovita</string>
     <string name="sync">Sünkrooni</string>
+    <string name="sync_all_action_dialog_description">Kõik sisalduvad kaustad ja failid laaditakse alla. Selle jaoks võib kuluda märgatav kogus andmeruumi ja sõltuvalt sinu internetiühendusest aega/ribalaiust.</string>
+    <string name="sync_all_action_dialog_title">Kas sünkroonid kogu kausta?</string>
     <string name="sync_anyway">Sünkrooni ikkagi</string>
     <string name="sync_conflict_notification_action_title">Lahenda failikonfliktid</string>
     <string name="sync_conflict_notification_description">Tuvastasin failide üleslaadimiskonflikte. Lahendamiseks ava üleslaadimiste vaade.</string>

app/src/main/res/values-lt-rLT/strings.xml

@@ -134,6 +134,7 @@
     <string name="autoupload_hide_folder">Slėpti aplanką</string>
     <string name="avatar">Avataras</string>
     <string name="away">Atsitraukęs</string>
+    <string name="backup_list_adapter_local_contacts">Vietiniai kontaktai</string>
     <string name="backup_settings">Atsarginių kopijų nustatymai</string>
     <string name="backup_title">Kontaktų ir kalendoriaus atsarginė kopija</string>
     <string name="battery_optimization_close">Užverti</string>
@@ -502,6 +503,7 @@
     <string name="filedetails_download">Atsisiųsti</string>
     <string name="filedetails_export">Eksportuoti</string>
     <string name="filedetails_renamed_in_upload_msg">Failas pervadintas kaip %1$s įkėlimo metu</string>
+    <string name="filedetails_sync_all_files">Sinchronizuoti viską</string>
     <string name="filedetails_sync_file">Sinchronizuoti</string>
     <string name="filedisplay_no_file_selected">Neįkeltas joks failas</string>
     <string name="filename_empty">Failo pavadinimas negali būti tuščias</string>
@@ -995,6 +997,8 @@
     <string name="subtitle_videos_only">Tik vaizdo įrašai</string>
     <string name="suggest">Siūlyti</string>
     <string name="sync">Sinchronizuoti</string>
+    <string name="sync_all_action_dialog_description">Bus atsisiųsti visi esantys failai ir aplankai. Tam gali prireikti daug vietos saugykloje ir tai gali užtrukti, priklausomai nuo jūsų ryšio.</string>
+    <string name="sync_all_action_dialog_title">Sinchronizuoti visą aplanką?</string>
     <string name="sync_anyway">Vis tiek sinchronizuoti</string>
     <string name="sync_conflict_notification_action_title">Išspręsti konfliktus</string>
     <string name="sync_conflict_notification_description">Aptikti įkėlimo nesuderinamumai. Atidarykite įkėlimus, kad juos išspręstumėte.</string>

app/src/main/res/values-sl/strings.xml

@@ -124,6 +124,7 @@
     <string name="common_loading">Poteka nalaganje …</string>
     <string name="common_next">Naprej </string>
     <string name="common_no">Ne</string>
+    <string name="common_now">Zdaj</string>
     <string name="common_ok">V redu</string>
     <string name="common_pending">Na čakanju</string>
     <string name="common_remove">Izbriši</string>

gradle/libs.versions.toml

@@ -5,7 +5,7 @@
 androidCommonLibraryVersion = "38fffa4a03"
 androidGifDrawableVersion = "1.2.31"
 androidImageCropperVersion = "4.7.0"
-androidLibraryVersion ="dd85553abaea1c05dc514268a3cf4a976535bc2b"
+androidLibraryVersion ="1f476c0ab14fb280172be2aefd70db80e50bb17b"
 androidOpensslVersion = "3.5.6"
 androidPluginVersion = "9.2.1"
 androidsvgVersion = "1.4"
@@ -86,6 +86,7 @@ stateless4jVersion = "2.6.0"
 webkitVersion = "1.16.0"
 workRuntime = "2.11.2"
 foundationVersion = "1.11.2"
+browserVersion = "1.10.0"
 material3Version = "1.4.0"
 
 [libraries]
@@ -96,6 +97,7 @@ conscrypt-android = { module = "org.conscrypt:conscrypt-android", version.ref =
 bcpkix-jdk18on = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkixJdk18onVersion" }
 
 # UI
+browser = { module = "androidx.browser:browser", version.ref = "browserVersion" }
 appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appCompatVersion" }
 cardview = { module = "androidx.cardview:cardview", version.ref = "cardviewVersion" }
 core-ktx = { module = "androidx.test:core-ktx", version.ref = "androidxTestVersion" }

gradle/verification-metadata.xml

@@ -49,6 +49,7 @@
          <trusted-key id="0CDE80149711EB46DFF17AE421A24B3F8B0F594A" group="org.apache" name="apache" version="16"/>
          <trusted-key id="0D35D3F60078655126908E8AF3D1600878E85A3D" group="io.netty"/>
          <trusted-key id="0E225917414670F4442C250DFD533C07C264648F">
+            <trusting group="androidx.browser" name="browser" version="1.10.0"/>
             <trusting group="androidx.core"/>
             <trusting group="androidx.databinding"/>
             <trusting group="androidx.media3"/>
@@ -20784,6 +20785,14 @@
             <sha256 value="f5dbf2a98f6cbe6a1ab81364c15250bd5d5872fe1e524bd57c3d135e1e6143ee" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="01adfc0a1f">
+         <artifact name="android-library-01adfc0a1f.aar">
+            <sha256 value="51b447988336ba10eca921d3f308da168313a16f352362cea5b7bd229bdaf2c6" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-01adfc0a1f.module">
+            <sha256 value="9ee93f81089c2f4b3841a7efa5c77f845bf13811d5d6a340d35cb960537cfb10" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="0303be50f9">
          <artifact name="android-library-0303be50f9.aar">
             <sha256 value="d10959e216de68719efc582c5698b7e78385a53900672cb024ecc36111be6d2f" origin="Generated by Gradle" reason="Artifact is not signed"/>
@@ -20920,6 +20929,14 @@
             <sha256 value="e0c738e7c3648549631eda0f90d3ae028d6199ffe368324baf0503433535f33f" origin="Generated by Gradle" reason="Artifact is not signed"/>
          </artifact>
       </component>
+      <component group="com.github.nextcloud" name="android-library" version="1f476c0ab14fb280172be2aefd70db80e50bb17b">
+         <artifact name="android-library-1f476c0ab14fb280172be2aefd70db80e50bb17b.aar">
+            <sha256 value="716116b7ba65762dcca6f1a728022893dffdc3634efdf6f84296f444dfc65a39" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+         <artifact name="android-library-1f476c0ab14fb280172be2aefd70db80e50bb17b.module">
+            <sha256 value="2c42a082fd1b6185ccc0354a88c91e2a580016f9e8577ef102bd8351024cc9ab" origin="Generated by Gradle" reason="Artifact is not signed"/>
+         </artifact>
+      </component>
       <component group="com.github.nextcloud" name="android-library" version="2.22.2">
          <artifact name="android-library-2.22.2.aar">
             <sha256 value="d498cd9e68c7c4d1bfa3013372e3a575d692d9f6bb525df7e881fed0a718a246" origin="Generated by Gradle" reason="Artifact is not signed"/>