Bläddra i källkod

Hide loading dialog for navigation paths

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 år sedan
förälder
incheckning
a3f17bb493

+ 15 - 0
app/src/main/java/com/nextcloud/client/files/DeepLinkConstants.kt

@@ -25,4 +25,19 @@ object DeepLinkConstants {
 
     const val ACTION_CREATE_NEW = "createNew"
     const val ACTION_APP_UPDATE = "checkAppUpdate"
+
+    val navigationPaths = listOf(
+        OPEN_FILES,
+        OPEN_FAVORITES,
+        OPEN_MEDIA,
+        OPEN_SHARED,
+        OPEN_OFFLINE,
+        OPEN_NOTIFICATIONS,
+        OPEN_DELETED,
+        OPEN_SETTINGS,
+        OPEN_AUTO_UPLOAD,
+        OPEN_EXTERNAL_URL,
+        ACTION_CREATE_NEW,
+        ACTION_APP_UPDATE
+    )
 }

+ 2 - 0
app/src/main/java/com/nextcloud/client/files/DeepLinkHandler.kt

@@ -33,6 +33,8 @@ class DeepLinkHandler(
         val BASE_URL_GROUP_INDEX = 1
         val INDEX_PATH_GROUP_INDEX = 2
         val FILE_ID_GROUP_INDEX = 3
+
+        fun isDeepLinkTypeIsNavigation(deepLinkUrl: String): Boolean = DeepLinkConstants.navigationPaths.any { deepLinkUrl.endsWith(it) }
     }
 
     /**

+ 4 - 1
app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -2324,7 +2324,10 @@ public class FileDisplayActivity extends FileActivity
     }
 
     private void handleOpenFileViaIntent(Intent intent) {
-        showLoadingDialog(getString(R.string.retrieving_file));
+        Uri deepLinkUri = getIntent().getData();
+        if (deepLinkUri == null || !DeepLinkHandler.Companion.isDeepLinkTypeIsNavigation(deepLinkUri.toString())) {
+            showLoadingDialog(getString(R.string.retrieving_file));
+        }
 
         String userName = intent.getStringExtra(KEY_ACCOUNT);
         String fileId = intent.getStringExtra(KEY_FILE_ID);