Selaa lähdekoodia

Merge pull request #2286 from alexcustos/fix_force_old_login

Fixed layout when old login method enforced
Tobias Kaminsky 6 vuotta sitten
vanhempi
commit
960387322a

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

@@ -206,7 +206,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     private TextView mServerStatusView;
     private TextView mServerStatusView;
 
 
     private TextWatcher mHostUrlInputWatcher;
     private TextWatcher mHostUrlInputWatcher;
-    private String mServerStatusText;
+    private String mServerStatusText = "";
     private int mServerStatusIcon = 0;
     private int mServerStatusIcon = 0;
 
 
     private boolean mServerIsChecked = false;
     private boolean mServerIsChecked = false;
@@ -226,7 +226,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
 
 
     private WebView mLoginWebView;
     private WebView mLoginWebView;
 
 
-    private String mAuthStatusText;
+    private String mAuthStatusText = "";
     private int mAuthStatusIcon = 0;
     private int mAuthStatusIcon = 0;
 
 
     private String mAuthToken = "";
     private String mAuthToken = "";
@@ -1963,7 +1963,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
      * to the last check on the ownCloud server.
      * to the last check on the ownCloud server.
      */
      */
     private void showServerStatus() {
     private void showServerStatus() {
-        if (mServerStatusIcon == 0 && "".equals(mServerStatusText) || forceOldLoginMethod) {
+        if (mServerStatusIcon == 0 && "".equals(mServerStatusText)) {
             mServerStatusView.setVisibility(View.INVISIBLE);
             mServerStatusView.setVisibility(View.INVISIBLE);
         } else {
         } else {
             mServerStatusView.setText(mServerStatusText);
             mServerStatusView.setText(mServerStatusText);