Signed-off-by: alperozturk <alper_ozturk@proton.me>
@@ -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()
@@ -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;