Refactoring of main Activities and Fragments to avoid inconsistent states leading...

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / Preferences.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/Preferences.java b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
index 7de3227..22c9876 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
@@ -27,6 +27,7 @@ import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;\r
 import android.preference.Preference;\r
 import android.preference.Preference.OnPreferenceChangeListener;\r
+import android.preference.Preference.OnPreferenceClickListener;\r
 import android.util.Log;\r
 import android.view.ContextMenu;\r
 import android.view.ContextMenu.ContextMenuInfo;\r
@@ -70,10 +71,19 @@ public class Preferences extends SherlockPreferenceActivity implements
         mDbHandler = new DbHandler(getBaseContext());\r
         mSessions = new Vector<OwnCloudSession>();\r
         addPreferencesFromResource(R.xml.preferences);\r
-        registerForContextMenu(getListView());\r
         populateAccountList();\r
         ActionBar actionBar = getSherlock().getActionBar();\r
         actionBar.setDisplayHomeAsUpEnabled(true);\r
+        Preference p = findPreference("manage_account");\r
+        if (p != null)\r
+        p.setOnPreferenceClickListener(new OnPreferenceClickListener() {\r
+            @Override\r
+            public boolean onPreferenceClick(Preference preference) {\r
+                Intent i = new Intent(getApplicationContext(), AccountSelectActivity.class);\r
+                startActivity(i);\r
+                return true;\r
+            }\r
+        });\r
     }\r
 \r
     /**\r
@@ -149,19 +159,6 @@ public class Preferences extends SherlockPreferenceActivity implements
     }\r
 \r
     @Override\r
-    public void onCreateContextMenu(ContextMenu menu, View v,\r
-            ContextMenuInfo menuInfo) {\r
-        super.onCreateContextMenu(menu, v, menuInfo);\r
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;\r
-        mSelectedMenuItem = info.position - 1;\r
-        menu.setHeaderTitle(mSessions.get(mSelectedMenuItem).getName());\r
-\r
-        MenuInflater inflater = getSherlock().getMenuInflater();\r
-        inflater.inflate(R.menu.session_context_menu, (Menu) menu);\r
-\r
-    }\r
-\r
-    @Override\r
     protected void onDestroy() {\r
         mDbHandler.close();\r
         super.onDestroy();\r