X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/3e4f8b4f0d6f4af39de9a25279005efa6d447e68..a032bdeebc51a6e81d1bd5c558944f96fc55eacb:/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 ffc13976..c2173956 100644
--- 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;
 import android.accounts.AccountManager;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
+import android.preference.PreferenceManager;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View;
-import android.widget.AdapterView.AdapterContextMenuInfo;
 
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockPreferenceActivity;
 import com.actionbarsherlock.view.Menu;
-import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
 import eu.alefzero.owncloud.AccountUtils;
@@ -45,7 +42,6 @@ import eu.alefzero.owncloud.OwnCloudSession;
 import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.db.DbHandler;
-import eu.alefzero.owncloud.syncadapter.FileSyncAdapter;
 
 /**
  * An Activity that allows the user to change the application's settings.
@@ -54,16 +50,17 @@ import eu.alefzero.owncloud.syncadapter.FileSyncAdapter;
  * 
  */
 public class Preferences extends SherlockPreferenceActivity implements
-        OnPreferenceChangeListener {
+        OnPreferenceChangeListener{
     private static final String TAG = "OwnCloudPreferences";
     private final int mNewSession = 47;
     private final int mEditSession = 48;
     private DbHandler mDbHandler;
     private Vector<OwnCloudSession> mSessions;
-    private Account[] mAccounts;
-    private ListPreference mAccountList;
+    //private Account[] mAccounts;
+    //private ListPreference mAccountList;
     private ListPreference mTrackingUpdateInterval;
     private CheckBoxPreference mDeviceTracking;
+    private CheckBoxPreference pCode;
     private int mSelectedMenuItem;
 
     @Override
@@ -72,7 +69,7 @@ public class Preferences extends SherlockPreferenceActivity implements
         mDbHandler = new DbHandler(getBaseContext());
         mSessions = new Vector<OwnCloudSession>();
         addPreferencesFromResource(R.xml.preferences);
-        populateAccountList();
+        //populateAccountList();
         ActionBar actionBar = getSherlock().getActionBar();
         actionBar.setDisplayHomeAsUpEnabled(true);
         Preference p = findPreference("manage_account");
@@ -86,17 +83,19 @@ public class Preferences extends SherlockPreferenceActivity implements
             }
         });
         
-        CheckBoxPreference pCode = (CheckBoxPreference) findPreference("set_pincode");
+        pCode = (CheckBoxPreference) findPreference("set_pincode");
+         
+        
         if (pCode != null){
             
             pCode.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    
-                                        
+                                          
                     Intent i = new Intent(getApplicationContext(), PinCodeActivity.class);
                     i.putExtra(PinCodeActivity.EXTRA_ACTIVITY, "preferences");
                     i.putExtra(PinCodeActivity.EXTRA_NEW_STATE, newValue.toString());
+                    
                     startActivity(i);
                     
                     return true;
@@ -107,9 +106,24 @@ public class Preferences extends SherlockPreferenceActivity implements
         
     }
 
+
+    @Override
+    protected void onResume() {
+        // TODO Auto-generated method stub
+        SharedPreferences appPrefs = PreferenceManager
+                .getDefaultSharedPreferences(getApplicationContext());
+        
+        boolean state = appPrefs.getBoolean("set_pincode", false);
+        pCode.setChecked(state);
+        
+        super.onResume();
+    }
+
+
+
     /**
      * Populates the account selector
-     */
+     *-/
     private void populateAccountList() {
         AccountManager accMan = AccountManager.get(this);
         mAccounts = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE);
@@ -131,8 +145,10 @@ public class Preferences extends SherlockPreferenceActivity implements
 
         mAccountList.setEntries(accNames);
         mAccountList.setEntryValues(accNames);
-    }
+    }*/
 
+    
+    
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
@@ -185,6 +201,8 @@ public class Preferences extends SherlockPreferenceActivity implements
         super.onDestroy();
     }
 
+    
+    
     @Override
     /**
      * Updates various summaries after updates. Also starts and stops 
@@ -192,12 +210,12 @@ public class Preferences extends SherlockPreferenceActivity implements
      */
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         // Update current account summary
-        if (preference.equals(mAccountList)) {
+        /*if (preference.equals(mAccountList)) {
             mAccountList.setSummary(newValue.toString());
         }
 
         // Update tracking interval summary
-        else if (preference.equals(mTrackingUpdateInterval)) {
+        else*/ if (preference.equals(mTrackingUpdateInterval)) {
             String trackingSummary = getResources().getString(
                     R.string.prefs_trackmydevice_interval_summary);
             trackingSummary = String.format(trackingSummary,
@@ -213,8 +231,10 @@ public class Preferences extends SherlockPreferenceActivity implements
             locationServiceIntent.putExtra("TRACKING_SETTING",
                     (Boolean) newValue);
             sendBroadcast(locationServiceIntent);
-        }
+        } 
         return true;
     }
+    
+    
 
 }