OC-3390: Message is shown in the login screen instead of an alert message: Change...

diff --git a/src/com/owncloud/android/authentication/AuthenticatorActivity.java b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
index 72b6594..16ce755 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -35,7 +35,6 @@ import android.net.http.SslError;
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.os.Bundle;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r

-import android.support.v4.app.DialogFragment;\r

 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r
 import android.support.v4.app.FragmentTransaction;\r
 import android.support.v4.app.Fragment;\r
 import android.support.v4.app.FragmentManager;\r
 import android.support.v4.app.FragmentTransaction;\r


@@ -74,8 +73,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r
 import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.lib.resources.files.ExistenceCheckRemoteOperation;\r
 import com.owncloud.android.lib.resources.users.GetRemoteUserNameOperation;\r

-
-import com.owncloud.android.ui.dialog.AlertMessageDialog;\r
+\r

 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog;\r
 import com.owncloud.android.ui.dialog.SslUntrustedCertDialog.OnSslUntrustedCertListener;\r


@@ -130,7 +128,6 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r
     private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\r
     public static final byte ACTION_UPDATE_TOKEN = 1;\r
 \r
     private static final String TAG_SAML_DIALOG = "samlWebViewDialog";\r

-    private static final String TAG_ALERT_MESSAGE_DIALOG = "alertMessagewDialog";\r

     \r
     private String mHostBaseUrl;\r
     private OwnCloudVersion mDiscoveredVersion;\r
     \r
     private String mHostBaseUrl;\r
     private OwnCloudVersion mDiscoveredVersion;\r


@@ -1147,6 +1144,11 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         mAuthStatusText = R.string.auth_fail_get_user_name;\r
     }\r
     \r
         mAuthStatusText = R.string.auth_fail_get_user_name;\r
     }\r
     \r

+    private void updateServerStatusIconNoRegularAuth(){\r
+        mServerStatusIcon = android.R.drawable.ic_secure;\r
+        mServerStatusText = R.string.auth_unsupported_auth_method;\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


@@ -1204,8 +1206,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mOkButton.setEnabled(false);\r
                 mTryEmptyAuthorization = false;\r
                 mServerIsValid = false;\r
                 mOkButton.setEnabled(false);\r
                 mTryEmptyAuthorization = false;\r
                 mServerIsValid = false;\r

-               //show an alert message\r
-               showAlertMessageDialog(R.string.common_alert_title, R.string.auth_unsupported_auth_method);\r
+                //show an alert message\r
+                updateServerStatusIconNoRegularAuth();\r
+                showServerStatus();\r

                 \r
             } else {\r
                 Log_OC.d(TAG, "Successful access - time to save the account");\r
                 \r
             } else {\r
                 Log_OC.d(TAG, "Successful access - time to save the account");\r


@@ -1778,10 +1781,5 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
         }\r
         \r
     }\r
         }\r
         \r
     }\r

-    \r
-    private void showAlertMessageDialog(int tittle, int message) {\r
-        DialogFragment newAlertMessage = AlertMessageDialog.newInstance(tittle, message);\r
-        newAlertMessage.show(getSupportFragmentManager(), TAG_ALERT_MESSAGE_DIALOG);\r
-    }\r

 \r
 }\r
 \r
 }\r

diff --git a/src/com/owncloud/android/ui/dialog/AlertMessageDialog.java b/src/com/owncloud/android/ui/dialog/AlertMessageDialog.java
deleted file mode 100644 (file)
index 82164c3..0000000
--- a/src/com/owncloud/android/ui/dialog/AlertMessageDialog.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/* ownCloud Android client application
- *   Copyright (C) 2012-2014 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.ui.dialog;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.os.Bundle;
-
-import com.actionbarsherlock.app.SherlockDialogFragment;
-import com.owncloud.android.R;
-
-public class AlertMessageDialog extends SherlockDialogFragment {
-    
-    private static final String ARG_TITLE_ID = AlertMessageDialog.class.getCanonicalName() + ".ARG_TITLE_ID";
-    private static final String ARG_MESSAGE_ID = AlertMessageDialog.class.getCanonicalName() + ".ARG_MESSAGE_ID";
-
-
-    public static AlertMessageDialog newInstance(int title, int message) {
-        AlertMessageDialog frag = new AlertMessageDialog();
-        Bundle args = new Bundle();
-        args.putInt(ARG_TITLE_ID, title);
-        args.putInt(ARG_MESSAGE_ID, message);
-        frag.setArguments(args);
-        return frag;
-    }
-
-    @Override
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(getSherlockActivity());
-        
-        int title = getArguments().getInt(ARG_TITLE_ID);
-        int message = getArguments().getInt(ARG_MESSAGE_ID);
-        
-        dialogBuilder.setIcon(R.drawable.common_error)
-            .setTitle(title)
-            .setMessage(message)
-            .setCancelable(true)
-            .setPositiveButton(R.string.common_ok, 
-                    new DialogInterface.OnClickListener() {
-                public void onClick(DialogInterface dialog, int whichButton) {
-                    dialog.dismiss();
-                }
-            });
-        return dialogBuilder.create();
-    }
-
-}