Grant that notifications of finished downloads can be removed from notification are...

[pub/Android/ownCloud.git] / 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 2fabc33..9dcddce 100644 (file)
--- 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
     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r
     }\r
 \r
     private void onGetUserNameFinish(GetRemoteUserNameOperation operation, RemoteOperationResult result) {\r

+        \r

         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r
         if (result.isSuccess()) {\r
             boolean success = false;\r
             String username = operation.getUserName();\r


@@ -839,7 +840,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
             if (success)\r
                 finish();\r
         } else {\r
             if (success)\r
                 finish();\r
         } else {\r

-            updateAuthStatusIconAndText(result);\r
+            updateStatusIconFailUserName();\r

             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r
             showAuthStatus();\r
             Log_OC.e(TAG, "Access to user name failed: " + result.getLogMessage());\r
         }\r


@@ -1111,6 +1112,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     }\r
 \r
 \r
     }\r
 \r
 \r

+    private void updateStatusIconFailUserName(){\r
+        mAuthStatusIcon = android.R.drawable.ic_secure;\r
+        mAuthStatusText = R.string.auth_fail_get_user_name;\r
+    }\r
+    \r

     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r
     /**\r
      * Processes the result of the request for and access token send \r
      * to an OAuth authorization server.\r


@@ -1659,6 +1665,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         }\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r

+        ft.addToBackStack(null);\r

         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
     }\r
     \r
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
     }\r
     \r


@@ -1670,6 +1677,7 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r
         SslUntrustedCertDialog dialog = SslUntrustedCertDialog.newInstanceForFullSslError((CertificateCombinedException)result.getException());\r
         FragmentManager fm = getSupportFragmentManager();\r
         FragmentTransaction ft = fm.beginTransaction();\r

+        ft.addToBackStack(null);\r

         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
         \r
     }\r
         dialog.show(ft, DIALOG_UNTRUSTED_CERT);\r
         \r
     }\r


@@ -1724,11 +1732,4 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         \r
     }\r
 \r
         \r
     }\r
 \r

-    public void reloadWebView() {\r
-        Fragment fd = getSupportFragmentManager().findFragmentByTag(TAG_SAML_DIALOG);\r
-        if (fd != null && fd instanceof SamlWebViewDialog) {\r
-                ((SamlWebViewDialog) fd).reloadWebView();\r
-        }\r
-    }\r
-\r

 }\r
 }\r