فهرست منبع

code enhancement

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 7 سال پیش
والد
کامیت
2655d6f87b
1فایلهای تغییر یافته به همراه4 افزوده شده و 9 حذف شده
  1. 4 9
      src/main/java/com/owncloud/android/jobs/AccountRemovalJob.java

+ 4 - 9
src/main/java/com/owncloud/android/jobs/AccountRemovalJob.java

@@ -66,17 +66,14 @@ public class AccountRemovalJob extends Job implements AccountManagerCallback<Boo
         Context context = MainApp.getAppContext();
         PersistableBundleCompat bundle = params.getExtras();
         Account account = AccountUtils.getOwnCloudAccountByName(context, bundle.getString(ACCOUNT, ""));
+        AccountManager am = (AccountManager) context.getSystemService(ACCOUNT_SERVICE);
 
-        if (account != null ) {
+        if (account == null || am == null) {
+            return Result.FAILURE;
+        } else {
             // disable contact backup job
             ContactsPreferenceActivity.cancelPreviousContactBackupJobForAccount(context, account);
 
-            AccountManager am = (AccountManager) context.getSystemService(ACCOUNT_SERVICE);
-
-            if (am == null) {
-                return Result.FAILURE;
-            }
-
             am.removeAccount(account, this, null);
 
             FileDataStorageManager storageManager = new FileDataStorageManager(account, context.getContentResolver());
@@ -121,8 +118,6 @@ public class AccountRemovalJob extends Job implements AccountManagerCallback<Boo
             }
 
             return Result.SUCCESS;
-        } else {
-            return Result.FAILURE;
         }
     }