merge fix

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / adapter / LandingScreenAdapter.java

diff --git a/src/eu/alefzero/owncloud/ui/adapter/LandingScreenAdapter.java b/src/eu/alefzero/owncloud/ui/adapter/LandingScreenAdapter.java
index 914ed43..def7a48 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/adapter/LandingScreenAdapter.java
+++ b/src/eu/alefzero/owncloud/ui/adapter/LandingScreenAdapter.java
@@ -25,8 +25,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;\r
 import android.widget.ImageView;\r
 import android.widget.TextView;\r
 import android.widget.BaseAdapter;\r
 import android.widget.ImageView;\r
 import android.widget.TextView;\r

+import eu.alefzero.owncloud.AccountUtils;\r

 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.R;\r

-import eu.alefzero.owncloud.authenticator.AuthUtils;\r

 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.owncloud.ui.activity.Preferences;\r
 \r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
 import eu.alefzero.owncloud.ui.activity.Preferences;\r
 \r


@@ -74,7 +74,8 @@ public class LandingScreenAdapter extends BaseAdapter {
                         * We will put in the one that is selected in the preferences\r
                         */\r
                        intent.setClass(mContext, FileDisplayActivity.class);   \r
                         * We will put in the one that is selected in the preferences\r
                         */\r
                        intent.setClass(mContext, FileDisplayActivity.class);   \r

-                       intent.putExtra("ACCOUNT", AuthUtils.getCurrentOwnCloudAccount(mContext));\r
+                       intent.putExtra("ACCOUNT", AccountUtils.getCurrentOwnCloudAccount(mContext));\r
+                       intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);\r

                        break;\r
                case 5:\r
                        intent.setClass(mContext, Preferences.class);\r
                        break;\r
                case 5:\r
                        intent.setClass(mContext, Preferences.class);\r