Merge branch 'setup_colors' into setup_app_name

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / LandingActivity.java

diff --git a/src/com/owncloud/android/ui/activity/LandingActivity.java b/src/com/owncloud/android/ui/activity/LandingActivity.java
index 8540bb2..45ed279 100644 (file)
--- a/src/com/owncloud/android/ui/activity/LandingActivity.java
+++ b/src/com/owncloud/android/ui/activity/LandingActivity.java
@@ -17,7 +17,6 @@
 package com.owncloud.android.ui.activity;\r
 \r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 package com.owncloud.android.ui.activity;\r
 \r
 import com.actionbarsherlock.app.SherlockFragmentActivity;\r

-import com.owncloud.android.authentication.AccountAuthenticator;\r

 import com.owncloud.android.ui.adapter.LandingScreenAdapter;\r
 \r
 import android.accounts.Account;\r
 import com.owncloud.android.ui.adapter.LandingScreenAdapter;\r
 \r
 import android.accounts.Account;\r


@@ -33,6 +32,8 @@ import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;\r
 import android.widget.GridView;\r
 import android.widget.Toast;\r
 import android.widget.AdapterView.OnItemClickListener;\r
 import android.widget.GridView;\r
 import android.widget.Toast;\r

+\r
+import com.owncloud.android.MainApp;\r

 import com.owncloud.android.R;\r
 \r
 /**\r
 import com.owncloud.android.R;\r
 \r
 /**\r


@@ -114,7 +115,7 @@ public class LandingActivity extends SherlockFragmentActivity implements
         case DialogInterface.BUTTON_POSITIVE:\r
             Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
             intent.putExtra("authorities",\r
         case DialogInterface.BUTTON_POSITIVE:\r
             Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);\r
             intent.putExtra("authorities",\r

-                    new String[] { AccountAuthenticator.AUTHORITY });\r
+                    new String[] { MainApp.getAuthTokenType() });\r

             startActivity(intent);\r
             break;\r
         case DialogInterface.BUTTON_NEGATIVE:\r
             startActivity(intent);\r
             break;\r
         case DialogInterface.BUTTON_NEGATIVE:\r


@@ -150,7 +151,7 @@ public class LandingActivity extends SherlockFragmentActivity implements
     private boolean accountsAreSetup() {\r
         AccountManager accMan = AccountManager.get(this);\r
         Account[] accounts = accMan\r
     private boolean accountsAreSetup() {\r
         AccountManager accMan = AccountManager.get(this);\r
         Account[] accounts = accMan\r

-                .getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
+                .getAccountsByType(MainApp.getAccountType());\r

         return accounts.length > 0;\r
     }\r
 \r
         return accounts.length > 0;\r
     }\r
 \r