X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7dfa955a03c8c4844d076d399b5d24b448ad9583..c8fe95b914f27bff1bcc696e12fc2f87dbfbe59c:/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 792bf58f..51d0b383 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -70,8 +70,6 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
 
     private DbHandler mDbHandler;
     private CheckBoxPreference pCode;
-    //private CheckBoxPreference pLogging;
-    //private Preference pLoggingHistory;
     private Preference pAboutApp;
 
     private Account mPreviousAccount = null;
@@ -108,6 +106,7 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                 ListView listView = (ListView) parent;
                 ListAdapter listAdapter = listView.getAdapter();
                 Object obj = listAdapter.getItem(position);
+
                 if (obj != null && obj instanceof LongClickableCheckBoxPreference) {
                     mShowContextMenu = true;
                     mAccountName = obj.toString();
@@ -121,6 +120,7 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
             }
         });
 
+        // Register context menu for list of preferences.
         registerForContextMenu(getListView());
 
         pCode = (CheckBoxPreference) findPreference("set_pincode");
@@ -260,48 +260,13 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                    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
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+
+        // Filter for only showing contextual menu when long press on the
+        // accounts
         if (mShowContextMenu) {
             getMenuInflater().inflate(R.menu.account_picker_long_click, menu);
             mShowContextMenu = false;
@@ -323,6 +288,8 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
         for (Account a : accounts) {
             if (a.name.equals(mAccountName)) {
                 if (item.getItemId() == R.id.change_password) {
+
+                    // Change account password
                     Intent updateAccountCredentials = new Intent(this, AuthenticatorActivity.class);
                     updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACCOUNT, a);
                     updateAccountCredentials.putExtra(AuthenticatorActivity.EXTRA_ACTION,
@@ -330,6 +297,8 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                     startActivity(updateAccountCredentials);
 
                 } else if (item.getItemId() == R.id.delete_account) {
+
+                    // Remove account
                     am.removeAccount(a, this, mHandler);
                 }
             }
@@ -349,7 +318,7 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                     accountName = accounts[0].name;
                 AccountUtils.setCurrentOwnCloudAccount(this, accountName);
             }
-            createAccountsCheckboxPreferences();
+            addAccountsCheckboxPreferences();
         }
     }
 
@@ -361,7 +330,7 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
         pCode.setChecked(state);
 
         // Populate the accounts category with the list of accounts
-        createAccountsCheckboxPreferences();
+        addAccountsCheckboxPreferences();
     }
 
     @Override
@@ -403,7 +372,7 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
      * Create the list of accounts that has been added into the app
      */
     @SuppressWarnings("deprecation")
-    private void createAccountsCheckboxPreferences() {
+    private void addAccountsCheckboxPreferences() {
 
         // Remove accounts in case list is refreshing for avoiding to have
         // duplicate items
@@ -427,6 +396,7 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                 LongClickableCheckBoxPreference accountPreference = new LongClickableCheckBoxPreference(this);
                 accountPreference.setKey(a.name);
                 accountPreference.setTitle(a.name);
+                mAccountsPrefCategory.addPreference(accountPreference);
 
                 // Check the current account that is being used
                 if (a.name.equals(currentAccount.name)) {
@@ -454,7 +424,6 @@ public class Preferences extends SherlockPreferenceActivity implements AccountMa
                     }
                 });
 
-                mAccountsPrefCategory.addPreference(accountPreference);
             }
 
             // Add Create Account preference at the end of account list if