Merge pull request #12049 from nextcloud/feature/use-m3-SyncedFolderP…

…referencesDialogFragment Use M3 for SyncedFolderPreferencesDialogFragment
nextcloud · Oct 30, 2023 · 2d6a8c4 · 2d6a8c4
2 parents f108266 + f016d0b
commit 2d6a8c4
Show file tree

Hide file tree

Showing 5 changed files with 602 additions and 681 deletions.
diff --git a/...y/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog.png b/...y/debug/com.nextcloud.client.SyncedFoldersActivityIT_testSyncedFolderDialog.png
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.kt
@@ -643,7 +643,11 @@ class SyncedFoldersActivity :
         }
     }
 
-    override fun onSaveSyncedFolderPreference(syncedFolder: SyncedFolderParcelable) {
+    override fun onSaveSyncedFolderPreference(syncedFolder: SyncedFolderParcelable?) {
+        if (syncedFolder == null) {
+            return
+        }
+
         // custom folders newly created aren't in the list already,
         // so triggering a refresh
         if (MediaFolderType.CUSTOM == syncedFolder.type && syncedFolder.id == SyncedFolder.UNPERSISTED_ID) {
@@ -730,7 +734,11 @@ class SyncedFoldersActivity :
         syncedFolderPreferencesDialogFragment = null
     }
 
-    override fun onDeleteSyncedFolderPreference(syncedFolder: SyncedFolderParcelable) {
+    override fun onDeleteSyncedFolderPreference(syncedFolder: SyncedFolderParcelable?) {
+        if (syncedFolder == null) {
+            return
+        }
+
         syncedFolderProvider.deleteSyncedFolder(syncedFolder.id)
         adapter.removeItem(syncedFolder.section)
     }