|
|
@@ -18,26 +18,40 @@
|
|
|
package com.owncloud.android.ui.activity;
|
|
|
|
|
|
import android.accounts.Account;
|
|
|
+import android.accounts.AccountManager;
|
|
|
+import android.accounts.AccountManagerCallback;
|
|
|
+import android.accounts.AccountManagerFuture;
|
|
|
import android.content.Intent;
|
|
|
import android.content.SharedPreferences;
|
|
|
import android.content.pm.PackageInfo;
|
|
|
import android.content.pm.PackageManager.NameNotFoundException;
|
|
|
import android.net.Uri;
|
|
|
import android.os.Bundle;
|
|
|
+import android.os.Handler;
|
|
|
import android.preference.CheckBoxPreference;
|
|
|
import android.preference.Preference;
|
|
|
import android.preference.Preference.OnPreferenceChangeListener;
|
|
|
import android.preference.Preference.OnPreferenceClickListener;
|
|
|
import android.preference.PreferenceCategory;
|
|
|
import android.preference.PreferenceManager;
|
|
|
+import android.view.ContextMenu;
|
|
|
+import android.view.ContextMenu.ContextMenuInfo;
|
|
|
+import android.view.View;
|
|
|
+import android.widget.AdapterView;
|
|
|
+import android.widget.AdapterView.OnItemLongClickListener;
|
|
|
+import android.widget.ListAdapter;
|
|
|
+import android.widget.ListView;
|
|
|
|
|
|
import com.actionbarsherlock.app.ActionBar;
|
|
|
import com.actionbarsherlock.app.SherlockPreferenceActivity;
|
|
|
import com.actionbarsherlock.view.Menu;
|
|
|
import com.actionbarsherlock.view.MenuItem;
|
|
|
+import com.owncloud.android.MainApp;
|
|
|
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.ui.LongClickableCheckBoxPreference;
|
|
|
import com.owncloud.android.utils.DisplayUtils;
|
|
|
import com.owncloud.android.utils.Log_OC;
|
|
|
|
|
|
@@ -48,15 +62,24 @@ import com.owncloud.android.utils.Log_OC;
|
|
|
* @author Bartek Przybylski
|
|
|
* @author David A. Velasco
|
|
|
*/
|
|
|
-public class Preferences extends SherlockPreferenceActivity {
|
|
|
+public class Preferences extends SherlockPreferenceActivity implements AccountManagerCallback<Boolean> {
|
|
|
|
|
|
private static final String TAG = "OwnCloudPreferences";
|
|
|
+
|
|
|
+ private static final String PREVIOUS_ACCOUNT_KEY = "ACCOUNT";
|
|
|
+
|
|
|
private DbHandler mDbHandler;
|
|
|
private CheckBoxPreference pCode;
|
|
|
//private CheckBoxPreference pLogging;
|
|
|
//private Preference pLoggingHistory;
|
|
|
private Preference pAboutApp;
|
|
|
|
|
|
+ private Account mPreviousAccount = null;
|
|
|
+ private PreferenceCategory mAccountsPrefCategory = null;
|
|
|
+ private final Handler mHandler = new Handler();
|
|
|
+ private String mAccountName;
|
|
|
+ private boolean mShowContextMenu = false;
|
|
|
+
|
|
|
|
|
|
@SuppressWarnings("deprecation")
|
|
|
@Override
|
|
|
@@ -64,22 +87,44 @@ public class Preferences extends SherlockPreferenceActivity {
|
|
|
super.onCreate(savedInstanceState);
|
|
|
mDbHandler = new DbHandler(getBaseContext());
|
|
|
addPreferencesFromResource(R.xml.preferences);
|
|
|
- //populateAccountList();
|
|
|
+
|
|
|
ActionBar actionBar = getSherlock().getActionBar();
|
|
|
actionBar.setIcon(DisplayUtils.getSeasonalIconId());
|
|
|
actionBar.setDisplayHomeAsUpEnabled(true);
|
|
|
|
|
|
- Preference p = findPreference("manage_account");
|
|
|
- if (p != null)
|
|
|
- p.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
|
|
+ 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");
|
|
|
+
|
|
|
+ ListView listView = getListView();
|
|
|
+ listView.setOnItemLongClickListener(new OnItemLongClickListener() {
|
|
|
@Override
|
|
|
- public boolean onPreferenceClick(Preference preference) {
|
|
|
- Intent i = new Intent(getApplicationContext(), AccountSelectActivity.class);
|
|
|
- startActivity(i);
|
|
|
- return true;
|
|
|
+ public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
|
|
|
+ ListView listView = (ListView) parent;
|
|
|
+ ListAdapter listAdapter = listView.getAdapter();
|
|
|
+ Object obj = listAdapter.getItem(position);
|
|
|
+
|
|
|
+ if (obj != null && obj instanceof LongClickableCheckBoxPreference) {
|
|
|
+ mShowContextMenu = true;
|
|
|
+ mAccountName = obj.toString();
|
|
|
+
|
|
|
+ Preferences.this.openContextMenu(listView);
|
|
|
+
|
|
|
+ View.OnLongClickListener longListener = (View.OnLongClickListener) obj;
|
|
|
+ return longListener.onLongClick(view);
|
|
|
+ }
|
|
|
+ return false;
|
|
|
}
|
|
|
});
|
|
|
-
|
|
|
+
|
|
|
+ // Register context menu for list of preferences.
|
|
|
+ registerForContextMenu(getListView());
|
|
|
+
|
|
|
pCode = (CheckBoxPreference) findPreference("set_pincode");
|
|
|
if (pCode != null){
|
|
|
pCode.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
|
|
|
@@ -95,8 +140,6 @@ public class Preferences extends SherlockPreferenceActivity {
|
|
|
});
|
|
|
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
|
|
|
PreferenceCategory preferenceCategory = (PreferenceCategory) findPreference("more");
|
|
|
|
|
|
@@ -259,12 +302,75 @@ public class Preferences extends SherlockPreferenceActivity {
|
|
|
|
|
|
}
|
|
|
|
|
|
+ @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;
|
|
|
+ }
|
|
|
+ super.onCreateContextMenu(menu, v, menuInfo);
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Called when the user clicked on an item into the context menu created at
|
|
|
+ * {@link #onCreateContextMenu(ContextMenu, View, ContextMenuInfo)} for
|
|
|
+ * every ownCloud {@link Account} , containing 'secondary actions' for them.
|
|
|
+ *
|
|
|
+ * {@inheritDoc}
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public boolean onContextItemSelected(android.view.MenuItem item) {
|
|
|
+ AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
|
|
|
+ Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
|
|
|
+ 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,
|
|
|
+ AuthenticatorActivity.ACTION_UPDATE_TOKEN);
|
|
|
+ startActivity(updateAccountCredentials);
|
|
|
+
|
|
|
+ } else if (item.getItemId() == R.id.delete_account) {
|
|
|
+
|
|
|
+ // Remove account
|
|
|
+ am.removeAccount(a, this, mHandler);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void run(AccountManagerFuture<Boolean> future) {
|
|
|
+ if (future.isDone()) {
|
|
|
+ Account a = AccountUtils.getCurrentOwnCloudAccount(this);
|
|
|
+ String accountName = "";
|
|
|
+ if (a == null) {
|
|
|
+ Account[] accounts = AccountManager.get(this).getAccountsByType(MainApp.getAccountType());
|
|
|
+ if (accounts.length != 0)
|
|
|
+ accountName = accounts[0].name;
|
|
|
+ AccountUtils.setCurrentOwnCloudAccount(this, accountName);
|
|
|
+ }
|
|
|
+ addAccountsCheckboxPreferences();
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
protected void onResume() {
|
|
|
super.onResume();
|
|
|
SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
|
|
|
boolean state = appPrefs.getBoolean("set_pincode", false);
|
|
|
pCode.setChecked(state);
|
|
|
+
|
|
|
+ // Populate the accounts category with the list of accounts
|
|
|
+ addAccountsCheckboxPreferences();
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -301,5 +407,110 @@ public class Preferences extends SherlockPreferenceActivity {
|
|
|
mDbHandler.close();
|
|
|
super.onDestroy();
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Create the list of accounts that has been added into the app
|
|
|
+ */
|
|
|
+ @SuppressWarnings("deprecation")
|
|
|
+ private void addAccountsCheckboxPreferences() {
|
|
|
+
|
|
|
+ // Remove accounts in case list is refreshing for avoiding to have
|
|
|
+ // duplicate items
|
|
|
+ if (mAccountsPrefCategory.getPreferenceCount() > 0) {
|
|
|
+ mAccountsPrefCategory.removeAll();
|
|
|
+ }
|
|
|
+
|
|
|
+ AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
|
|
|
+ Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
|
|
|
+ Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(getApplicationContext());
|
|
|
+
|
|
|
+ if (am.getAccountsByType(MainApp.getAccountType()).length == 0) {
|
|
|
+ // Show create account screen if there isn't any account
|
|
|
+ am.addAccount(MainApp.getAccountType(), null, null, null, this,
|
|
|
+ null,
|
|
|
+ null);
|
|
|
+ }
|
|
|
+ else {
|
|
|
+
|
|
|
+ for (Account a : accounts) {
|
|
|
+ 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)) {
|
|
|
+ accountPreference.setChecked(true);
|
|
|
+ } else {
|
|
|
+ accountPreference.setChecked(false);
|
|
|
+ }
|
|
|
+
|
|
|
+ accountPreference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
|
|
|
+ @Override
|
|
|
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
|
|
|
+ String key = preference.getKey();
|
|
|
+ AccountManager am = (AccountManager) getSystemService(ACCOUNT_SERVICE);
|
|
|
+ Account accounts[] = am.getAccountsByType(MainApp.getAccountType());
|
|
|
+ for (Account a : accounts) {
|
|
|
+ CheckBoxPreference p = (CheckBoxPreference) findPreference(a.name);
|
|
|
+ if (key.equals(a.name)) {
|
|
|
+ p.setChecked(true);
|
|
|
+ AccountUtils.setCurrentOwnCloudAccount(getApplicationContext(), a.name);
|
|
|
+ } else {
|
|
|
+ p.setChecked(false);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return (Boolean) newValue;
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ // Add Create Account preference at the end of account list if
|
|
|
+ // Multiaccount is enabled
|
|
|
+ if (getResources().getBoolean(R.bool.multiaccount_support)) {
|
|
|
+ createAddAccountPreference();
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * Create the preference for allow adding new accounts
|
|
|
+ */
|
|
|
+ private void createAddAccountPreference() {
|
|
|
+ Preference addAccountPref = new Preference(this);
|
|
|
+ addAccountPref.setKey("add_account");
|
|
|
+ addAccountPref.setTitle(getString(R.string.prefs_add_account));
|
|
|
+ mAccountsPrefCategory.addPreference(addAccountPref);
|
|
|
+
|
|
|
+ addAccountPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
|
|
|
+ @Override
|
|
|
+ public boolean onPreferenceClick(Preference preference) {
|
|
|
+ AccountManager am = AccountManager.get(getApplicationContext());
|
|
|
+ am.addAccount(MainApp.getAccountType(), null, null, null, Preferences.this, null, null);
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
+ @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();
|
|
|
+ }
|
|
|
+
|
|
|
}
|
purigarcia