X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8c6f415ed47c3c456be4d9d4f391582d368b3278..35bf347759e43efff51c28ab8aaaf7e4aa3c2033:/src/com/owncloud/android/authentication/AuthenticatorActivity.java

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 2fabc330..9dcddcee 100644
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -815,6 +815,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
 
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {
+        
         if (result.isSuccess()) {
             boolean success = false;
             String username = operation.getUserName();
@@ -839,7 +840,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (success)
                 finish();
         } else {
-            updateAuthStatusIconAndText(result);
+            updateStatusIconFailUserName();
             showAuthStatus();
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());
         }
@@ -1111,6 +1112,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }
 
 
+    private void updateStatusIconFailUserName(){
+        mAuthStatusIcon = android.R.drawable.ic_secure;
+        mAuthStatusText = R.string.auth_fail_get_user_name;
+    }
+    
     /**
      * Processes the result of the request for and access token send 
      * to an OAuth authorization server.
@@ -1659,6 +1665,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }
         FragmentManager fm = getSupportFragmentManager();
         FragmentTransaction ft = fm.beginTransaction();
+        ft.addToBackStack(null);
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);
     }
     
@@ -1670,6 +1677,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());
         FragmentManager fm = getSupportFragmentManager();
         FragmentTransaction ft = fm.beginTransaction();
+        ft.addToBackStack(null);
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);
         
     }
@@ -1724,11 +1732,4 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         
     }
 
-    public void reloadWebView() {
-        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);
-        if (fd != null && fd instanceof SamlWebViewDialog) {
-                ((SamlWebViewDialog) fd).reloadWebView();
-        }
-    }
-
 }