Still better for progress circle initialization: looks like apply it after setContent...

[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 6d7fa0b..e71dbdf 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
@@ -22,10 +22,12 @@ import java.util.Vector;
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.content.Intent;\r
+import android.content.SharedPreferences;\r
 import android.os.Bundle;\r
 import android.preference.CheckBoxPreference;\r
 import android.preference.ListPreference;\r
 import android.preference.Preference;\r
+import android.preference.PreferenceManager;\r
 import android.preference.Preference.OnPreferenceChangeListener;\r
 import android.preference.Preference.OnPreferenceClickListener;\r
 import android.util.Log;\r
@@ -45,6 +47,7 @@ import eu.alefzero.owncloud.OwnCloudSession;
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.db.DbHandler;\r
+import eu.alefzero.owncloud.syncadapter.FileSyncAdapter;\r
 \r
 /**\r
  * An Activity that allows the user to change the application's settings.\r
@@ -53,7 +56,7 @@ import eu.alefzero.owncloud.db.DbHandler;
  * \r
  */\r
 public class Preferences extends SherlockPreferenceActivity implements\r
-        OnPreferenceChangeListener {\r
+        OnPreferenceChangeListener{\r
     private static final String TAG = "OwnCloudPreferences";\r
     private final int mNewSession = 47;\r
     private final int mEditSession = 48;\r
@@ -63,6 +66,7 @@ public class Preferences extends SherlockPreferenceActivity implements
     private ListPreference mAccountList;\r
     private ListPreference mTrackingUpdateInterval;\r
     private CheckBoxPreference mDeviceTracking;\r
+    private CheckBoxPreference pCode;\r
     private int mSelectedMenuItem;\r
 \r
     @Override\r
@@ -71,7 +75,6 @@ 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
@@ -85,8 +88,45 @@ public class Preferences extends SherlockPreferenceActivity implements
                 return true;\r
             }\r
         });\r
+        \r
+        pCode = (CheckBoxPreference) findPreference("set_pincode");\r
+         \r
+        \r
+        if (pCode != null){\r
+            \r
+            pCode.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {\r
+                @Override\r
+                public boolean onPreferenceChange(Preference preference, Object newValue) {\r
+                                          \r
+                    Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);\r
+                    i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "preferences");\r
+                    i.putExtra(PinCodeActivity.EXTRA_NEW_STATE, newValue.toString());\r
+                    \r
+                    startActivity(i);\r
+                    \r
+                    return true;\r
+                }\r
+            });            \r
+            \r
+        }\r
+        \r
+    }\r
+\r
+\r
+    @Override\r
+    protected void onResume() {\r
+        // TODO Auto-generated method stub\r
+        SharedPreferences appPrefs = PreferenceManager\r
+                .getDefaultSharedPreferences(getApplicationContext());\r
+        \r
+        boolean state = appPrefs.getBoolean("set_pincode", false);\r
+        pCode.setChecked(state);\r
+        \r
+        super.onResume();\r
     }\r
 \r
+\r
+\r
     /**\r
      * Populates the account selector\r
      */\r
@@ -113,6 +153,8 @@ public class Preferences extends SherlockPreferenceActivity implements
         mAccountList.setEntryValues(accNames);\r
     }\r
 \r
+    \r
+    \r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         super.onCreateOptionsMenu(menu);\r
@@ -160,24 +202,13 @@ 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
     }\r
 \r
+    \r
+    \r
     @Override\r
     /**\r
      * Updates various summaries after updates. Also starts and stops \r
@@ -206,8 +237,10 @@ public class Preferences extends SherlockPreferenceActivity implements
             locationServiceIntent.putExtra("TRACKING_SETTING",\r
                     (Boolean) newValue);\r
             sendBroadcast(locationServiceIntent);\r
-        }\r
+        } \r
         return true;\r
     }\r
+    \r
+    \r
 \r
 }\r