Эх сурвалжийг харах

Adopt tests for offline operations

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 9 сар өмнө
parent
commit
4abba845d0

+ 1 - 1
app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java

@@ -63,8 +63,8 @@ public class ConflictsResolveActivityIT extends AbstractIT {
         ConflictsResolveActivity sut = activityRule.launchActivity(intent);
 
         ConflictsResolveDialog dialog = ConflictsResolveDialog.newInstance(targetContext,
-                                                                           existingFile,
                                                                            newFile,
+                                                                           existingFile,
                                                                            UserAccountManagerImpl
                                                                                .fromContext(targetContext)
                                                                                .getUser()

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.java

@@ -212,7 +212,7 @@ public class OCFileListBottomSheetDialog extends BottomSheetDialog implements In
     }
 
     private void filterActionsForOfflineOperations() {
-        if (!file.isOfflineOperation() || file.isRootDirectory()) {
+        if (file == null || !file.isOfflineOperation() || file.isRootDirectory()) {
             return;
         }