Merge pull request #641 from owncloud/thumbnails_for_downloaded_images

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / Preferences.java

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 2711368..9ac6e27 100644 (file)
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -51,9 +51,9 @@ import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
 import com.owncloud.android.db.DbHandler;

+import com.owncloud.android.lib.common.utils.Log_OC;

 import com.owncloud.android.ui.LongClickableCheckBoxPreference;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.ui.LongClickableCheckBoxPreference;
 import com.owncloud.android.utils.DisplayUtils;

-import com.owncloud.android.utils.Log_OC;

 
 
 /**
 
 
 /**


@@ -66,15 +66,10 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
     
     private static final String TAG = "OwnCloudPreferences";
 
     
     private static final String TAG = "OwnCloudPreferences";
 

-    private static final String PREVIOUS_ACCOUNT_KEY = "ACCOUNT";
-

     private DbHandler mDbHandler;
     private CheckBoxPreference pCode;
     private DbHandler mDbHandler;
     private CheckBoxPreference pCode;

-    //private CheckBoxPreference pLogging;
-    //private Preference pLoggingHistory;

     private Preference pAboutApp;
 
     private Preference pAboutApp;
 

-    private Account mPreviousAccount = null;

     private PreferenceCategory mAccountsPrefCategory = null;
     private final Handler mHandler = new Handler();
     private String mAccountName;
     private PreferenceCategory mAccountsPrefCategory = null;
     private final Handler mHandler = new Handler();
     private String mAccountName;


@@ -91,13 +86,8 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
         ActionBar actionBar = getSherlock().getActionBar();
         actionBar.setIcon(DisplayUtils.getSeasonalIconId());
         actionBar.setDisplayHomeAsUpEnabled(true);
         ActionBar actionBar = getSherlock().getActionBar();
         actionBar.setIcon(DisplayUtils.getSeasonalIconId());
         actionBar.setDisplayHomeAsUpEnabled(true);

+        actionBar.setTitle(R.string.actionbar_settings);

         
         

-        if (savedInstanceState != null) {
-            mPreviousAccount = savedInstanceState.getParcelable(PREVIOUS_ACCOUNT_KEY);
-        } else {
-            mPreviousAccount = AccountUtils.getCurrentOwnCloudAccount(this);
-        }
-

         // Load the accounts category for adding the list of accounts
         mAccountsPrefCategory = (PreferenceCategory) findPreference("accounts_category");
 
         // Load the accounts category for adding the list of accounts
         mAccountsPrefCategory = (PreferenceCategory) findPreference("accounts_category");
 


@@ -262,44 +252,6 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                    Log_OC.e(TAG, "Error while showing about dialog", e);
                }
        }
                    Log_OC.e(TAG, "Error while showing about dialog", e);
                }
        }

-       
-       /* DISABLED FOR RELEASE UNTIL FIXED 
-       pLogging = (CheckBoxPreference) findPreference("log_to_file");
-       if (pLogging != null) {
-           pLogging.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-               @Override
-               public boolean onPreferenceChange(Preference preference, Object newValue) {
-                   
-                   String logpath = Environment.getExternalStorageDirectory()+File.separator+"owncloud"+File.separator+"log";
-                
-                   if(!pLogging.isChecked()) {
-                       Log_OC.d("Debug", "start logging");
-                       Log_OC.v("PATH", logpath);
-                       Log_OC.startLogging(logpath);
-                   }
-                   else {
-                       Log_OC.d("Debug", "stop logging");
-                       Log_OC.stopLogging();
-                   }
-                   return true;
-               }
-           });
-       }
-       
-       pLoggingHistory = (Preference) findPreference("log_history");
-       if (pLoggingHistory != null) {
-           pLoggingHistory.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-            
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                Intent intent = new Intent(getApplicationContext(),LogHistoryActivity.class);
-                startActivity(intent);
-                return true;
-            }
-        });
-       }
-       */
-       

     }
 
     @Override
     }
 
     @Override


@@ -454,8 +406,23 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                         for (Account a : accounts) {
                             CheckBoxPreference p = (CheckBoxPreference) findPreference(a.name);
                             if (key.equals(a.name)) {
                         for (Account a : accounts) {
                             CheckBoxPreference p = (CheckBoxPreference) findPreference(a.name);
                             if (key.equals(a.name)) {

+                                boolean accountChanged = !p.isChecked(); 

                                 p.setChecked(true);
                                 p.setChecked(true);

-                                AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), a.name);
+                                AccountUtils.setCurrentOwnCloudAccount(
+                                        getApplicationContext(),
+                                        a.name
+                                );
+                                if (accountChanged) {
+                                    // restart the main activity
+                                    Intent i = new Intent(
+                                            Preferences.this, 
+                                            FileDisplayActivity.class
+                                    );
+                                    i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                                    startActivity(i);
+                                } else {
+                                    finish();
+                                }

                             } else {
                                 p.setChecked(false);
                             }
                             } else {
                                 p.setChecked(false);
                             }


@@ -495,22 +462,4 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
 
     }
 
 
     }
 

-    @Override
-    protected void onPause() {
-        if (this.isFinishing()) {
-            Account current = AccountUtils.getCurrentOwnCloudAccount(this);
-            if ((mPreviousAccount == null && current != null)
-                    || (mPreviousAccount != null && !mPreviousAccount.equals(current))) {
-                // the account set as default changed since this activity was
-                // created
-
-                // restart the main activity
-                Intent i = new Intent(this, FileDisplayActivity.class);
-                i.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-                startActivity(i);
-            }
-        }
-        super.onPause();
-    }
-

 }
 }