Better synchronization for current account between FileDisplayActivity and FileListFr...

[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 634f54b..6d7fa0b 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
@@ -17,20 +17,17 @@
  */\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r
  */\r
 package eu.alefzero.owncloud.ui.activity;\r
 \r

-import java.net.URI;\r
-import java.net.URISyntaxException;\r

 import java.util.Vector;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import java.util.Vector;\r
 \r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r

-import android.app.Activity;\r

 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.preference.CheckBoxPreference;\r
 import android.preference.ListPreference;\r
 import android.preference.Preference;\r
 import android.preference.Preference.OnPreferenceChangeListener;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.preference.CheckBoxPreference;\r
 import android.preference.ListPreference;\r
 import android.preference.Preference;\r
 import android.preference.Preference.OnPreferenceChangeListener;\r

-import android.preference.PreferenceScreen;\r
+import android.preference.Preference.OnPreferenceClickListener;\r

 import android.util.Log;\r
 import android.view.ContextMenu;\r
 import android.view.ContextMenu.ContextMenuInfo;\r
 import android.util.Log;\r
 import android.view.ContextMenu;\r
 import android.view.ContextMenu.ContextMenuInfo;\r


@@ -78,43 +75,16 @@ public class Preferences extends SherlockPreferenceActivity implements
         populateAccountList();\r
         ActionBar actionBar = getSherlock().getActionBar();\r
         actionBar.setDisplayHomeAsUpEnabled(true);\r
         populateAccountList();\r
         ActionBar actionBar = getSherlock().getActionBar();\r
         actionBar.setDisplayHomeAsUpEnabled(true);\r

-\r
-        // Update summary for device tracking preference\r
-        mTrackingUpdateInterval = (ListPreference) findPreference("devicetracking_update_intervall");\r
-        String trackingSummary = getResources().getString(\r
-                R.string.prefs_trackmydevice_interval_summary);\r
-        trackingSummary = String.format(trackingSummary,\r
-                mTrackingUpdateInterval.getValue());\r
-        mTrackingUpdateInterval.setSummary(trackingSummary);\r
-        mTrackingUpdateInterval.setOnPreferenceChangeListener(this);\r
-\r
-        // Enable or disable device tracking service. Listen on events\r
-        mDeviceTracking = (CheckBoxPreference) findPreference("enable_devicetracking");\r
-        mDeviceTracking.setOnPreferenceChangeListener(this);\r
-\r
-        // populateSessionList();\r
-    }\r
-\r
-    private void populateSessionList() {\r
-        mSessions.clear();\r
-        mSessions = mDbHandler.getSessionList();\r
-        PreferenceScreen ps = getPreferenceScreen();\r
-        ps.removeAll();\r
-        addPreferencesFromResource(R.xml.preferences);\r
-        for (int i = 0; i < mSessions.size(); i++) {\r
-            Preference preference = new Preference(getBaseContext());\r
-            preference.setTitle(mSessions.get(i).getName());\r
-            URI uri;\r
-            try {\r
-                uri = new URI(mSessions.get(i).getUrl());\r
-            } catch (URISyntaxException e) {\r
-                e.printStackTrace(); // should never happen\r
-                continue;\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

-            preference.setSummary(uri.getScheme() + "://" + uri.getHost()\r
-                    + uri.getPath());\r
-            ps.addPreference(preference);\r
-        }\r
+        });\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r


@@ -131,7 +101,7 @@ public class Preferences extends SherlockPreferenceActivity implements
         if (defaultAccount != null) {\r
             mAccountList.setSummary(defaultAccount.name);\r
         }\r
         if (defaultAccount != null) {\r
             mAccountList.setSummary(defaultAccount.name);\r
         }\r

-\r
+        \r

         // Transform accounts into array of string for preferences to use\r
         String[] accNames = new String[mAccounts.length];\r
         for (int i = 0; i < mAccounts.length; i++) {\r
         // Transform accounts into array of string for preferences to use\r
         String[] accNames = new String[mAccounts.length];\r
         for (int i = 0; i < mAccounts.length; i++) {\r


@@ -146,8 +116,8 @@ public class Preferences extends SherlockPreferenceActivity implements
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         super.onCreateOptionsMenu(menu);\r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         super.onCreateOptionsMenu(menu);\r

-        MenuInflater inflater = getSherlock().getMenuInflater();\r
-        inflater.inflate(R.menu.prefs_menu, menu);\r
+        //MenuInflater inflater = getSherlock().getMenuInflater();\r
+        //inflater.inflate(R.menu.prefs_menu, menu);\r

         return true;\r
     }\r
 \r
         return true;\r
     }\r
 \r


@@ -157,7 +127,8 @@ public class Preferences extends SherlockPreferenceActivity implements
         Intent intent;\r
 \r
         switch (item.getItemId()) {\r
         Intent intent;\r
 \r
         switch (item.getItemId()) {\r

-        case R.id.addSessionItem:\r
+        //case R.id.addSessionItem:\r
+        case 1:\r

             intent = new Intent(this, PreferencesNewSession.class);\r
             startActivityForResult(intent, mNewSession);\r
             break;\r
             intent = new Intent(this, PreferencesNewSession.class);\r
             startActivityForResult(intent, mNewSession);\r
             break;\r


@@ -171,15 +142,8 @@ public class Preferences extends SherlockPreferenceActivity implements
                     .getUrl());\r
             startActivityForResult(intent, mEditSession);\r
             break;\r
                     .getUrl());\r
             startActivityForResult(intent, mEditSession);\r
             break;\r

-        case R.id.SessionContextRemove:\r
-            OwnCloudSession ocs = mSessions.get(mSelectedMenuItem);\r
-            mDbHandler.removeSessionWithId(ocs.getEntryId());\r
-            mSessions.remove(ocs);\r
-            getPreferenceScreen().removePreference(\r
-                    getPreferenceScreen().getPreference(mSelectedMenuItem + 1));\r
-            break;\r

         case android.R.id.home:\r
         case android.R.id.home:\r

-            intent = new Intent(getBaseContext(), LandingActivity.class);\r
+            intent = new Intent(getBaseContext(), FileDisplayActivity.class);\r

             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
             startActivity(intent);\r
             break;\r
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);\r
             startActivity(intent);\r
             break;\r


@@ -193,24 +157,6 @@ public class Preferences extends SherlockPreferenceActivity implements
     @Override\r
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         super.onActivityResult(requestCode, resultCode, data);\r
     @Override\r
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {\r
         super.onActivityResult(requestCode, resultCode, data);\r

-        if (resultCode == Activity.RESULT_OK) {\r
-            switch (requestCode) {\r
-            case mNewSession:\r
-                mDbHandler.addSession(data.getStringExtra("sessionName"),\r
-                        data.getStringExtra("sessionURL"));\r
-                getPreferenceScreen().removeAll();\r
-                addPreferencesFromResource(R.xml.preferences);\r
-                populateSessionList();\r
-                break;\r
-            case mEditSession:\r
-                mDbHandler.changeSessionFields(\r
-                        data.getIntExtra("sessionId", -1),\r
-                        data.getStringExtra("sessionName"),\r
-                        data.getStringExtra("sessionURL"));\r
-                populateSessionList();\r
-                break;\r
-            }\r
-        }\r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r