Reviewed integration with sychronization framework to fix problems in Android 4.4

[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 69872d7..faeffd5 100644 (file)
--- a/src/com/owncloud/android/authentication/AuthenticatorActivity.java
+++ b/src/com/owncloud/android/authentication/AuthenticatorActivity.java
@@ -63,7 +63,6 @@ import com.owncloud.android.operations.OwnCloudServerCheckOperation;
 import com.owncloud.android.operations.RemoteOperation;\r
 import com.owncloud.android.operations.RemoteOperationResult;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
-import com.owncloud.android.ui.CustomButton;\r
 import com.owncloud.android.ui.dialog.SamlWebViewDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
@@ -188,24 +187,24 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mOAuthAuthEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_1);\r
         mOAuthTokenEndpointText = (TextView)findViewById(R.id.oAuthEntryPoint_2);\r
         mOAuth2Check = (CheckBox) findViewById(R.id.oauth_onOff_check);\r
-        mOkButton = (CustomButton) findViewById(R.id.buttonOK);\r
+        mOkButton = findViewById(R.id.buttonOK);\r
         mAuthStatusLayout = (TextView) findViewById(R.id.auth_status_text); \r
         \r
         /// set Host Url Input Enabled\r
         mHostUrlInputEnabled = getResources().getBoolean(R.bool.show_server_url_input);\r
         \r
-\r
-        /// complete label for 'register account' button\r
-        Button b = (Button) findViewById(R.id.account_register);\r
-        if (b != null) {\r
-            b.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r
+        /// set visibility of link for new users\r
+        boolean accountRegisterVisibility = getResources().getBoolean(R.bool.show_welcome_link);\r
+        Button welcomeLink = (Button) findViewById(R.id.welcome_link);\r
+        if (welcomeLink != null) {\r
+            if (accountRegisterVisibility) {\r
+                welcomeLink.setVisibility(View.VISIBLE);\r
+                welcomeLink.setText(String.format(getString(R.string.auth_register), getString(R.string.app_name)));            \r
+            } else {\r
+                findViewById(R.id.welcome_link).setVisibility(View.GONE);\r
+            }\r
         }\r
 \r
-//        /// complete background of 'OK' button\r
-//        boolean customButtons = getResources().getBoolean(R.bool.custom_buttons);\r
-//        if (customButtons)\r
-//            mOkButton.setBackgroundResource(R.drawable.btn_default);\r
-        \r
         /// initialization\r
         mAccountMgr = AccountManager.get(this);\r
         mNewCapturedUriFromOAuth2Redirection = null;\r
@@ -1277,14 +1276,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
             setAccountAuthenticatorResult(intent.getExtras());\r
             setResult(RESULT_OK, intent);\r
     \r
-            /// immediately request for the synchronization of the new account\r
-            Bundle bundle = new Bundle();\r
-            bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
-            ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);\r
-            syncAccount();\r
-//          Bundle bundle = new Bundle();\r
-//          bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
-//          ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);\r
             return true;\r
         }\r
     }\r
@@ -1403,7 +1394,7 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
      * @param view      'Account register' button\r
      */\r
     public void onRegisterClick(View view) {\r
-        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.url_account_register)));\r
+        Intent register = new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.welcome_link_url)));\r
         setResult(RESULT_CANCELED);\r
         startActivity(register);\r
     }\r
@@ -1654,13 +1645,6 @@ implements  OnRemoteOperationListener, OnSslValidatorListener, OnFocusChangeList
         mAuthMessage.setVisibility(View.GONE);\r
     }\r
 \r
-    private void syncAccount(){\r
-        /// immediately request for the synchronization of the new account\r
-        Bundle bundle = new Bundle();\r
-        bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);\r
-        ContentResolver.requestSync(mAccount, MainApp.getAuthTokenType(), bundle);\r
-    }\r
-    \r
     @Override\r
     public boolean onTouchEvent(MotionEvent event) {\r
         if (MainApp.getAuthTokenTypeSamlSessionCookie().equals(mAuthTokenType) &&\r