Quick patch to fix operations not ready for HTTPS

[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..c217395 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/Preferences.java
+++ b/src/eu/alefzero/owncloud/ui/activity/Preferences.java
@@ -22,22 +22,19 @@ import java.util.Vector;
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.content.Intent;\r
 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.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
 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
-import android.view.View;\r
-import android.widget.AdapterView.AdapterContextMenuInfo;\r

 \r
 import com.actionbarsherlock.app.ActionBar;\r
 import com.actionbarsherlock.app.SherlockPreferenceActivity;\r
 import com.actionbarsherlock.view.Menu;\r
 \r
 import com.actionbarsherlock.app.ActionBar;\r
 import com.actionbarsherlock.app.SherlockPreferenceActivity;\r
 import com.actionbarsherlock.view.Menu;\r

-import com.actionbarsherlock.view.MenuInflater;\r

 import com.actionbarsherlock.view.MenuItem;\r
 \r
 import eu.alefzero.owncloud.AccountUtils;\r
 import com.actionbarsherlock.view.MenuItem;\r
 \r
 import eu.alefzero.owncloud.AccountUtils;\r


@@ -53,16 +50,17 @@ import eu.alefzero.owncloud.db.DbHandler;
  * \r
  */\r
 public class Preferences extends SherlockPreferenceActivity implements\r
  * \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
     private DbHandler mDbHandler;\r
     private Vector<OwnCloudSession> mSessions;\r
     private static final String TAG = "OwnCloudPreferences";\r
     private final int mNewSession = 47;\r
     private final int mEditSession = 48;\r
     private DbHandler mDbHandler;\r
     private Vector<OwnCloudSession> mSessions;\r

-    private Account[] mAccounts;\r
-    private ListPreference mAccountList;\r
+    //private Account[] mAccounts;\r
+    //private ListPreference mAccountList;\r

     private ListPreference mTrackingUpdateInterval;\r
     private CheckBoxPreference mDeviceTracking;\r
     private ListPreference mTrackingUpdateInterval;\r
     private CheckBoxPreference mDeviceTracking;\r

+    private CheckBoxPreference pCode;\r

     private int mSelectedMenuItem;\r
 \r
     @Override\r
     private int mSelectedMenuItem;\r
 \r
     @Override\r


@@ -71,8 +69,7 @@ public class Preferences extends SherlockPreferenceActivity implements
         mDbHandler = new DbHandler(getBaseContext());\r
         mSessions = new Vector<OwnCloudSession>();\r
         addPreferencesFromResource(R.xml.preferences);\r
         mDbHandler = new DbHandler(getBaseContext());\r
         mSessions = new Vector<OwnCloudSession>();\r
         addPreferencesFromResource(R.xml.preferences);\r

-        registerForContextMenu(getListView());\r
-        populateAccountList();\r
+        //populateAccountList();\r

         ActionBar actionBar = getSherlock().getActionBar();\r
         actionBar.setDisplayHomeAsUpEnabled(true);\r
         Preference p = findPreference("manage_account");\r
         ActionBar actionBar = getSherlock().getActionBar();\r
         actionBar.setDisplayHomeAsUpEnabled(true);\r
         Preference p = findPreference("manage_account");\r


@@ -85,11 +82,48 @@ public class Preferences extends SherlockPreferenceActivity implements
                 return true;\r
             }\r
         });\r
                 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
+\r

     /**\r
      * Populates the account selector\r
     /**\r
      * Populates the account selector\r

-     */\r
+     *-/\r

     private void populateAccountList() {\r
         AccountManager accMan = AccountManager.get(this);\r
         mAccounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r
     private void populateAccountList() {\r
         AccountManager accMan = AccountManager.get(this);\r
         mAccounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);\r


@@ -111,8 +145,10 @@ public class Preferences extends SherlockPreferenceActivity implements
 \r
         mAccountList.setEntries(accNames);\r
         mAccountList.setEntryValues(accNames);\r
 \r
         mAccountList.setEntries(accNames);\r
         mAccountList.setEntryValues(accNames);\r

-    }\r
+    }*/\r

 \r
 \r

+    \r
+    \r

     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         super.onCreateOptionsMenu(menu);\r
     @Override\r
     public boolean onCreateOptionsMenu(Menu menu) {\r
         super.onCreateOptionsMenu(menu);\r


@@ -160,24 +196,13 @@ public class Preferences extends SherlockPreferenceActivity implements
     }\r
 \r
     @Override\r
     }\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
     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
     @Override\r
     /**\r
      * Updates various summaries after updates. Also starts and stops \r


@@ -185,12 +210,12 @@ public class Preferences extends SherlockPreferenceActivity implements
      */\r
     public boolean onPreferenceChange(Preference preference, Object newValue) {\r
         // Update current account summary\r
      */\r
     public boolean onPreferenceChange(Preference preference, Object newValue) {\r
         // Update current account summary\r

-        if (preference.equals(mAccountList)) {\r
+        /*if (preference.equals(mAccountList)) {\r

             mAccountList.setSummary(newValue.toString());\r
         }\r
 \r
         // Update tracking interval summary\r
             mAccountList.setSummary(newValue.toString());\r
         }\r
 \r
         // Update tracking interval summary\r

-        else if (preference.equals(mTrackingUpdateInterval)) {\r
+        else*/ if (preference.equals(mTrackingUpdateInterval)) {\r

             String trackingSummary = getResources().getString(\r
                     R.string.prefs_trackmydevice_interval_summary);\r
             trackingSummary = String.format(trackingSummary,\r
             String trackingSummary = getResources().getString(\r
                     R.string.prefs_trackmydevice_interval_summary);\r
             trackingSummary = String.format(trackingSummary,\r


@@ -206,8 +231,10 @@ public class Preferences extends SherlockPreferenceActivity implements
             locationServiceIntent.putExtra("TRACKING_SETTING",\r
                     (Boolean) newValue);\r
             sendBroadcast(locationServiceIntent);\r
             locationServiceIntent.putExtra("TRACKING_SETTING",\r
                     (Boolean) newValue);\r
             sendBroadcast(locationServiceIntent);\r

-        }\r
+        } \r

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

+    \r
+    \r

 \r
 }\r
 \r
 }\r