Jelajahi Sumber

Merge pull request #9138 from nextcloud/fix-npe-during-contacts-backup

Fix NPE during contacts backup
Tobias Kaminsky 3 tahun lalu
induk
melakukan
9f64cba2b9

+ 4 - 2
src/main/java/com/owncloud/android/ui/fragment/contactsbackup/ContactsBackupFragment.java

@@ -198,7 +198,9 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
         final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
         final ContactsPreferenceActivity contactsPreferenceActivity = (ContactsPreferenceActivity) getActivity();
         if (contactsPreferenceActivity != null) {
         if (contactsPreferenceActivity != null) {
             String backupFolderPath = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
             String backupFolderPath = getResources().getString(R.string.contacts_backup_folder) + OCFile.PATH_SEPARATOR;
-            refreshBackupFolder(backupFolderPath, contactsPreferenceActivity, contactsPreferenceActivity.getStorageManager());
+            refreshBackupFolder(backupFolderPath,
+                                contactsPreferenceActivity.getApplicationContext(),
+                                contactsPreferenceActivity.getStorageManager());
         }
         }
     }
     }
 
 
@@ -212,7 +214,7 @@ public class ContactsBackupFragment extends FileFragment implements DatePickerDi
 
 
                 if (folder != null) {
                 if (folder != null) {
                     RefreshFolderOperation operation = new RefreshFolderOperation(folder, System.currentTimeMillis(),
                     RefreshFolderOperation operation = new RefreshFolderOperation(folder, System.currentTimeMillis(),
-                            false, false, storageManager, user, getContext());
+                            false, false, storageManager, user, context);
 
 
                     RemoteOperationResult result = operation.execute(user.toPlatformAccount(), context);
                     RemoteOperationResult result = operation.execute(user.toPlatformAccount(), context);
                     return result.isSuccess();
                     return result.isSuccess();