瀏覽代碼

Check nullability of accountName in FileDisplayActivity.java

Signed-off-by: alperozturk <alper_ozturk@proton.me>
alperozturk 1 年之前
父節點
當前提交
04f0a00d65
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

+ 3 - 1
app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java

@@ -13,6 +13,7 @@
  */
 package com.owncloud.android.ui.activity;
 
+import android.accounts.Account;
 import android.accounts.AuthenticatorException;
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -1354,7 +1355,8 @@ public class FileDisplayActivity extends FileActivity
         public void onReceive(Context context, Intent intent) {
             String uploadedRemotePath = intent.getStringExtra(FileUploadWorker.EXTRA_REMOTE_PATH);
             String accountName = intent.getStringExtra(FileUploadWorker.ACCOUNT_NAME);
-            boolean sameAccount = getAccount() != null && accountName.equals(getAccount().name);
+            Account account = getAccount();
+            boolean sameAccount = accountName != null && account != null && accountName.equals(account.name);
             OCFile currentDir = getCurrentDir();
             boolean isDescendant = currentDir != null && uploadedRemotePath != null && uploadedRemotePath.startsWith(currentDir.getRemotePath());