Merge pull request #12587 from nextcloud/fixAuthNPE

On branded clients NPE can occur
nextcloud · Feb 23, 2024 · 639a7b9 · 639a7b9
2 parents 5a6213d + 6513234
commit 639a7b9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java b/app/src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -60,7 +60,6 @@
 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 @@ protected void onDestroy() {
     }
 
 
+    @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;
         }