소스 검색

Merge pull request #12587 from nextcloud/fixAuthNPE

On branded clients NPE can occur
Tobias Kaminsky 1 년 전
부모
커밋
639a7b9f53
1개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 6 6
      app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

+ 6 - 6
app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -60,7 +60,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.text.Editable;
 import android.text.TextUtils;
 import android.util.AndroidRuntimeException;
 import android.view.KeyEvent;
@@ -215,7 +214,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private AccountManager mAccountMgr;
 
     /// Server PRE-Fragment elements
-    private AccountSetupBinding accountSetupBinding;
+    private AccountSetupBinding accountSetupBinding = null;
     private AccountSetupWebviewBinding accountSetupWebviewBinding;
 
     private String mServerStatusText = EMPTY_STRING;
@@ -768,13 +767,14 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
 
 
+    @SuppressFBWarnings("NP")
     private void checkOcServer() {
         String uri;
-        Editable hostUrlInput = accountSetupBinding.hostUrlInput.getText();
 
-        if (accountSetupBinding != null && hostUrlInput != null &&
-            !hostUrlInput.toString().isEmpty()) {
-            uri = hostUrlInput.toString().trim();
+        if (accountSetupBinding != null &&
+            accountSetupBinding.hostUrlInput.getText() != null &&
+            !accountSetupBinding.hostUrlInput.getText().toString().isEmpty()) {
+            uri = accountSetupBinding.hostUrlInput.getText().toString().trim();
         } else {
             uri = mServerInfo.mBaseUrl;
         }