From 814abc60edfb1f22072cfb51cb42d54cadc559bc Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Sat, 23 Jan 2016 18:44:40 +0100 Subject: [PATCH] Service detection, account settings * service detection: detect group memberships and query them for homesets * account settings * request account synchronization --- app/build.gradle | 1 + app/src/main/AndroidManifest.xml | 2 +- .../davdroid/syncadapter/SyncManager.java | 11 +- .../bitfire/davdroid/ui/AccountActivity.java | 46 ++++++- .../davdroid/ui/AccountListFragment.java | 1 + .../davdroid/ui/AccountSettingsActivity.java | 52 ++++++++ ...ment.java => AccountSettingsFragment.java} | 115 +++--------------- .../davdroid/ui/settings/AccountActivity.java | 43 ------- .../ui/settings/SettingsActivity.java | 55 --------- .../ui/settings/SettingsScopeFragment.java | 57 --------- .../alerts_and_states_warning.png | Bin 878 -> 0 bytes .../drawable-hdpi/ic_action_new_account.png | Bin 962 -> 0 bytes .../res/drawable-hdpi/ic_action_settings.png | Bin 953 -> 0 bytes .../main/res/drawable-hdpi/ic_read_only.png | Bin 1438 -> 0 bytes .../res/drawable-hdpi/show_sync_settings.png | Bin 1550 -> 0 bytes .../alerts_and_states_warning.png | Bin 613 -> 0 bytes .../drawable-mdpi/ic_action_new_account.png | Bin 666 -> 0 bytes .../res/drawable-mdpi/ic_action_settings.png | Bin 594 -> 0 bytes .../main/res/drawable-mdpi/ic_read_only.png | Bin 868 -> 0 bytes .../res/drawable-mdpi/show_sync_settings.png | Bin 910 -> 0 bytes .../alerts_and_states_warning.png | Bin 1020 -> 0 bytes .../drawable-xhdpi/ic_action_new_account.png | Bin 1049 -> 0 bytes .../res/drawable-xhdpi/ic_action_settings.png | Bin 1231 -> 0 bytes .../main/res/drawable-xhdpi/ic_read_only.png | Bin 1895 -> 0 bytes .../res/drawable-xhdpi/show_sync_settings.png | Bin 2038 -> 0 bytes .../alerts_and_states_warning.png | Bin 912 -> 0 bytes .../drawable-xxhdpi/ic_action_new_account.png | Bin 920 -> 0 bytes .../drawable-xxhdpi/ic_action_settings.png | Bin 1863 -> 0 bytes .../main/res/drawable-xxhdpi/ic_read_only.png | Bin 2037 -> 0 bytes .../drawable-xxhdpi/show_sync_settings.png | Bin 2745 -> 0 bytes .../res/drawable/ic_remove_circle_dark.xml | 5 + .../res/layout-sw720dp/settings_activity.xml | 27 ---- .../main/res/layout/account_caldav_item.xml | 6 + .../main/res/layout/account_carddav_item.xml | 8 +- app/src/main/res/layout/activity_account.xml | 8 +- ...vity.xml => activity_account_settings.xml} | 8 +- ...ss_book.xml => addressbook_properties.xml} | 13 ++ app/src/main/res/layout/settings_activity.xml | 14 --- app/src/main/res/menu/activity_account.xml | 5 + app/src/main/res/values/strings.xml | 18 +-- app/src/main/res/values/styles.xml | 10 +- ...account_prefs.xml => settings_account.xml} | 21 +--- app/src/main/res/xml/sync_prefs.xml | 4 +- dav4android | 2 +- 44 files changed, 173 insertions(+), 359 deletions(-) create mode 100644 app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java rename app/src/main/java/at/bitfire/davdroid/ui/{settings/AccountFragment.java => AccountSettingsFragment.java} (53%) delete mode 100644 app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java delete mode 100644 app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java delete mode 100644 app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java delete mode 100644 app/src/main/res/drawable-hdpi/alerts_and_states_warning.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_new_account.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_settings.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_read_only.png delete mode 100644 app/src/main/res/drawable-hdpi/show_sync_settings.png delete mode 100644 app/src/main/res/drawable-mdpi/alerts_and_states_warning.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_new_account.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_settings.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_read_only.png delete mode 100644 app/src/main/res/drawable-mdpi/show_sync_settings.png delete mode 100644 app/src/main/res/drawable-xhdpi/alerts_and_states_warning.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_new_account.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_settings.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_read_only.png delete mode 100644 app/src/main/res/drawable-xhdpi/show_sync_settings.png delete mode 100644 app/src/main/res/drawable-xxhdpi/alerts_and_states_warning.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_new_account.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_settings.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_read_only.png delete mode 100644 app/src/main/res/drawable-xxhdpi/show_sync_settings.png create mode 100644 app/src/main/res/drawable/ic_remove_circle_dark.xml delete mode 100644 app/src/main/res/layout-sw720dp/settings_activity.xml rename app/src/main/res/layout/{settings_account_activity.xml => activity_account_settings.xml} (63%) rename app/src/main/res/layout/{activity_create_address_book.xml => addressbook_properties.xml} (60%) delete mode 100644 app/src/main/res/layout/settings_activity.xml rename app/src/main/res/xml/{settings_account_prefs.xml => settings_account.xml} (75%) diff --git a/app/build.gradle b/app/build.gradle index 446d6e56..cb7b344a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,6 +65,7 @@ dependencies { compile 'com.android.support:appcompat-v7:23.+' compile 'com.android.support:cardview-v7:23.+' compile 'com.android.support:design:23.+' + compile 'com.android.support:preference-v7:23.+' compile project(':MemorizingTrustManager') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b7450630..44ea8bd1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -129,7 +129,7 @@ android:name=".ui.AccountActivity" android:parentActivityName=".ui.AccountsActivity"> - + { public static final String EXTRA_ACCOUNT_NAME = "account_name"; - private String accountName; + private Account account; private AccountInfo accountInfo; Toolbar tbCardDAV, tbCalDAV; @@ -75,11 +80,12 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - accountName = getIntent().getStringExtra(EXTRA_ACCOUNT_NAME); + String accountName = getIntent().getStringExtra(EXTRA_ACCOUNT_NAME); if (accountName == null) // invalid account name finish(); setTitle(accountName); + account = new Account(accountName, Constants.ACCOUNT_TYPE); setContentView(R.layout.activity_account); @@ -106,8 +112,14 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { + case R.id.sync_now: + requestSync(); + break; case R.id.settings: - // TODO + Bundle args = new Bundle(1); + Intent intent = new Intent(this, AccountSettingsActivity.class); + intent.putExtra(AccountSettingsActivity.EXTRA_ACCOUNT, account); + startActivity(intent); break; case R.id.delete_account: new AlertDialog.Builder(AccountActivity.this) @@ -366,6 +378,9 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu tv.setText(info.description); } + tv = (TextView)v.findViewById(R.id.read_only); + tv.setVisibility(info.readOnly ? View.VISIBLE : View.GONE); + return v; } } @@ -401,6 +416,9 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu tv.setText(info.description); } + tv = (TextView)v.findViewById(R.id.read_only); + tv.setVisibility(info.readOnly ? View.VISIBLE : View.GONE); + tv = (TextView)v.findViewById(R.id.events); tv.setVisibility(info.supportsVEVENT ? View.VISIBLE : View.GONE); @@ -414,8 +432,7 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu /* USER ACTIONS */ - protected void deleteAccount() { - Account account = new Account(accountName, Constants.ACCOUNT_TYPE); + private void deleteAccount() { AccountManager accountManager = AccountManager.get(this); if (Build.VERSION.SDK_INT >= 22) @@ -444,4 +461,21 @@ public class AccountActivity extends AppCompatActivity implements Toolbar.OnMenu }, null); } + private void requestSync() { + String authorities[] = { + ContactsContract.AUTHORITY, + CalendarContract.AUTHORITY, + TaskProvider.ProviderName.OpenTasks.authority + }; + + for (String authority : authorities) { + Bundle extras = new Bundle(); + extras.putInt(ContentResolver.SYNC_EXTRAS_EXPEDITED, 1); + extras.putInt(ContentResolver.SYNC_EXTRAS_MANUAL, 1); + ContentResolver.requestSync(account, authority, extras); + } + + Snackbar.make(getWindow().getDecorView(), R.string.account_synchronization_scheduled, Snackbar.LENGTH_LONG).show(); + } + } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java index cb6dcf0f..fb59323d 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountListFragment.java @@ -131,6 +131,7 @@ public class AccountListFragment extends ListFragment implements LoaderManager.L @Override protected void onStartLoading() { + Constants.log.debug("AccountListFragment: Start loading"); accountManager.addOnAccountsUpdatedListener(this, null, true); } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java new file mode 100644 index 00000000..8348e37c --- /dev/null +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsActivity.java @@ -0,0 +1,52 @@ +/* + * Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering). + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the GNU Public License v3.0 + * which accompanies this distribution, and is available at + * http://www.gnu.org/licenses/gpl.html + */ + +package at.bitfire.davdroid.ui; + +import android.accounts.Account; +import android.content.Intent; +import android.os.Bundle; +import android.support.v4.app.NavUtils; +import android.support.v7.app.AppCompatActivity; +import android.view.MenuItem; + +import at.bitfire.davdroid.R; + +public class AccountSettingsActivity extends AppCompatActivity { + public final static String EXTRA_ACCOUNT = "account"; + + private Account account; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_account_settings); + + account = getIntent().getParcelableExtra(EXTRA_ACCOUNT); + setTitle(getString(R.string.settings_title, account.name)); + + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + + if (savedInstanceState == null) + getSupportFragmentManager().beginTransaction() + .add(R.id.fragment, AccountSettingsFragment.instantiate(this, AccountSettingsFragment.class.getName(), getIntent().getExtras())) + .commit(); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) { + Intent intent = new Intent(this, AccountActivity.class); + intent.putExtra(AccountActivity.EXTRA_ACCOUNT_NAME, account.name); + NavUtils.navigateUpTo(this, intent); + return true; + } else + return super.onOptionsItemSelected(item); + } + +} diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsFragment.java similarity index 53% rename from app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java rename to app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsFragment.java index cfd2bd2a..cce97f5d 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountFragment.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AccountSettingsFragment.java @@ -6,44 +6,39 @@ * http://www.gnu.org/licenses/gpl.html */ -package at.bitfire.davdroid.ui.settings; +package at.bitfire.davdroid.ui; import android.accounts.Account; -import android.app.AlertDialog; -import android.app.DialogFragment; -import android.content.DialogInterface; import android.os.Bundle; -import android.preference.EditTextPreference; -import android.preference.ListPreference; -import android.preference.Preference; -import android.preference.PreferenceFragment; -import android.preference.SwitchPreference; import android.provider.CalendarContract; import android.provider.ContactsContract; - -import java.io.File; +import android.support.v7.preference.EditTextPreference; +import android.support.v7.preference.ListPreference; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceFragmentCompat; +import android.support.v7.preference.SwitchPreferenceCompat; import at.bitfire.davdroid.R; -import at.bitfire.davdroid.log.ExternalFileLogger; import at.bitfire.davdroid.syncadapter.AccountSettings; import at.bitfire.ical4android.TaskProvider; -public class AccountFragment extends PreferenceFragment { - final static String ARG_ACCOUNT = "account"; - +public class AccountSettingsFragment extends PreferenceFragmentCompat { Account account; @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.settings_account_prefs); - - account = getArguments().getParcelable(ARG_ACCOUNT); + account = getArguments().getParcelable(AccountSettingsActivity.EXTRA_ACCOUNT); refresh(); } - public void refresh() { + @Override + public void onCreatePreferences(Bundle bundle, String s) { + addPreferencesFromResource(R.xml.settings_account); + } + + public void refresh() { final AccountSettings settings = new AccountSettings(getActivity(), account); // category: authentication @@ -68,7 +63,7 @@ public class AccountFragment extends PreferenceFragment { } }); - final SwitchPreference prefPreemptive = (SwitchPreference)findPreference("preemptive"); + final SwitchPreferenceCompat prefPreemptive = (SwitchPreferenceCompat)findPreference("preemptive"); prefPreemptive.setChecked(settings.preemptiveAuth()); prefPreemptive.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { @Override @@ -139,86 +134,6 @@ public class AccountFragment extends PreferenceFragment { prefSyncTasks.setSummary(R.string.settings_sync_summary_not_available); } - // category: debug info - - final SwitchPreference prefLogExternalFile = (SwitchPreference)findPreference("log_external_file"); - prefLogExternalFile.setChecked(settings.logToExternalFile()); - File logDirectory = ExternalFileLogger.getDirectory(getActivity()); - prefLogExternalFile.setSummaryOn(logDirectory != null ? - getString(R.string.settings_log_to_external_file_on, logDirectory.getPath()) : - getString(R.string.settings_log_to_external_file_no_external_storage) - ); - prefLogExternalFile.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - Boolean external = (Boolean) newValue; - if (external) { - getFragmentManager().beginTransaction() - .add(LogExternalFileDialogFragment.newInstance(account), null) - .commit(); - return false; - } else { - settings.logToExternalFile(false); - refresh(); - return false; - } - } - }); - - final SwitchPreference prefLogVerbose = (SwitchPreference)findPreference("log_verbose"); - prefLogVerbose.setChecked(settings.logVerbose()); - prefLogVerbose.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - settings.logVerbose((Boolean) newValue); - refresh(); return false; - } - }); - } - - public static class LogExternalFileDialogFragment extends DialogFragment { - private static final String - KEY_ACCOUNT = "account"; - - public static LogExternalFileDialogFragment newInstance(Account account) { - Bundle args = new Bundle(); - args.putParcelable(KEY_ACCOUNT, account); - LogExternalFileDialogFragment fragment = new LogExternalFileDialogFragment(); - fragment.setArguments(args); - return fragment; - } - - @Override - public AlertDialog onCreateDialog(Bundle savedInstanceState) { - final AccountSettings settings = new AccountSettings(getActivity(), (Account)getArguments().getParcelable(KEY_ACCOUNT)); - return new AlertDialog.Builder(getActivity()) - .setTitle(R.string.settings_security_warning) - .setIcon(android.R.drawable.ic_dialog_alert) - .setMessage(R.string.settings_log_to_external_file_confirmation) - .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - settings.logToExternalFile(false); - refresh(); - } - }) - .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - settings.logToExternalFile(true); - refresh(); - } - }) - .create(); - } - - private void refresh() { - AccountFragment fragment = (AccountFragment)getActivity().getFragmentManager().findFragmentByTag(SettingsActivity.TAG_ACCOUNT_SETTINGS); - if (fragment != null) - fragment.refresh(); - } - } - } diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java deleted file mode 100644 index c2a4d8d5..00000000 --- a/app/src/main/java/at/bitfire/davdroid/ui/settings/AccountActivity.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering). - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - */ - -package at.bitfire.davdroid.ui.settings; - -import android.accounts.Account; -import android.app.Activity; -import android.app.FragmentManager; -import android.os.Bundle; - -import at.bitfire.davdroid.R; - -public class AccountActivity extends Activity { - public static final String EXTRA_ACCOUNT = "account"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setContentView(R.layout.settings_account_activity); - getActionBar().setDisplayHomeAsUpEnabled(true); - - final FragmentManager fm = getFragmentManager(); - AccountFragment fragment = (AccountFragment)fm.findFragmentById(R.id.account_fragment); - if (fragment == null) { - fragment = new AccountFragment(); - final Bundle args = new Bundle(1); - Account account = getIntent().getExtras().getParcelable(EXTRA_ACCOUNT); - args.putParcelable(AccountFragment.ARG_ACCOUNT, account); - fragment.setArguments(args); - - getFragmentManager().beginTransaction() - .add(R.id.account_fragment, fragment, SettingsActivity.TAG_ACCOUNT_SETTINGS) - .commit(); - } - } - -} diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java deleted file mode 100644 index d94060b3..00000000 --- a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsActivity.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering). - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - */ - -package at.bitfire.davdroid.ui.settings; - -import android.accounts.Account; -import android.app.Activity; -import android.app.FragmentTransaction; -import android.content.Intent; -import android.os.Bundle; - -import at.bitfire.davdroid.R; - -public class SettingsActivity extends Activity { - public final static String TAG_ACCOUNT_SETTINGS = "account_settings"; - - boolean tabletLayout; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - setContentView(R.layout.settings_activity); - - tabletLayout = findViewById(R.id.right_pane) != null; - if (tabletLayout) { - SettingsScopeFragment scope = (SettingsScopeFragment)getFragmentManager().findFragmentById(R.id.settings_scope); - scope.setLayout(true); - } - } - - void showAccountSettings(Account account) { - if (tabletLayout) { - AccountFragment fragment = new AccountFragment(); - - Bundle args = new Bundle(1); - args.putParcelable(AccountFragment.ARG_ACCOUNT, account); - fragment.setArguments(args); - - getFragmentManager().beginTransaction() - .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN) - .replace(R.id.right_pane, fragment, TAG_ACCOUNT_SETTINGS) - .commit(); - } else { // phone layout - Intent intent = new Intent(getApplicationContext(), AccountActivity.class); - intent.putExtra(AccountActivity.EXTRA_ACCOUNT, account); - startActivity(intent); - } - } -} diff --git a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java b/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java deleted file mode 100644 index 756f1ece..00000000 --- a/app/src/main/java/at/bitfire/davdroid/ui/settings/SettingsScopeFragment.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright © 2013 – 2015 Ricki Hirner (bitfire web engineering). - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the GNU Public License v3.0 - * which accompanies this distribution, and is available at - * http://www.gnu.org/licenses/gpl.html - */ - -package at.bitfire.davdroid.ui.settings; - -import android.accounts.Account; -import android.accounts.AccountManager; -import android.app.ListFragment; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ArrayAdapter; -import android.widget.ListView; - -import at.bitfire.davdroid.Constants; -import at.bitfire.davdroid.R; - -public class SettingsScopeFragment extends ListFragment { - Account[] accounts; - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - final AccountManager manager = AccountManager.get(getActivity()); - accounts = manager.getAccountsByType(Constants.ACCOUNT_TYPE); - - final String[] accountNames = new String[accounts.length]; - for (int i = 0; i < accounts.length; i++) - accountNames[i] = accounts[i].name; - setListAdapter(new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_activated_1, accountNames)); - - return super.onCreateView(inflater, container, savedInstanceState); - } - - public void setLayout(boolean tabletLayout) { - if (tabletLayout) - getListView().setChoiceMode(ListView.CHOICE_MODE_SINGLE); - } - - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - setEmptyText(getString(R.string.settings_no_accounts)); - } - - @Override - public void onListItemClick(ListView l, View v, int position, long id) { - l.clearChoices(); - ((SettingsActivity)getActivity()).showAccountSettings(accounts[position]); - l.setItemChecked(position, true); - } -} diff --git a/app/src/main/res/drawable-hdpi/alerts_and_states_warning.png b/app/src/main/res/drawable-hdpi/alerts_and_states_warning.png deleted file mode 100644 index a82ac4ac14ddd56319d6a1fdf89cce9afd1585c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 878 zcmV-!1CjiRP)8BCJekgCPMMQ1@Pk`ITm|bh_R}mo$!%X)p^eF5ZSK)%!Fb1F>OK@GN909 z;Bk!mKdiOSV{)(5$Tp6F*VfuE1EG+Jw5hWOl;e&Okzz!)*uhz4U`<3SX=oIr;XW`6 zTyo?gNb!3~1;(NNPkH3f%*$J<4V;G=ZwV>;FVRJv9X^#>!?= z)PY42nTkZ#8KneGs|c(EBPqQf#R#x2B5#0(k0F7t_ko&vKP%k0v+ z*Q=}+dqkiFJW@k_j^2mBXJgDcW6Y=~{&n@NYjHUMt{7w9hhf-ET1IavZ+$&j1)jz3 zRT4C~N!8(Y?4_3YFgM*`mdH?_b07*qoM6N<$ Ef=HizN&o-= diff --git a/app/src/main/res/drawable-hdpi/ic_action_new_account.png b/app/src/main/res/drawable-hdpi/ic_action_new_account.png deleted file mode 100644 index 9a41829f6dc9044443dbac1e670b889d87f782dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 962 zcmV;z13mnSP)ztmYI&Mbp%#NzTFV;5d@By?1F6$RBP|ooJ-|m`LPS2K5kyZ)V@D`hlaK=Y0_o-x!1M z`z@Ey6<}MP+f`s5_yKGOcI)>A;IfGPY1s-W`4M2G&TSWXEh6K-?@xK2_XOCZE7b>N zJkOi8SpnCQd=@y|V4O|B?TFmUz$CD&`Edxy*|?Hxxd0o1y%EjFv7|{IP1YfGr2rTN z25b^JV;MkJFB$}J+!*5n?|_5AvDo`_HUu&>AN{~tprpFbM(owGH4@tZmem>?nL!X+ zsUY_I1sejcMFIo-Rf|kAjsp~d*4U`;`}n?J@jNdZCTfCrKLw^d&r4j)T#MPq7&8Ej zCLE^#JQR_@#)aG@2N&TZZwlXHexL#Kn@WuQR^XC|yjksJqy^VPHesLdgydI~kZF={7(flT8IF)I z0(syQa3dtY7IJBA{G9}{ae>FcUA51}q_b*_ae>po05B;cGpQx9o+iX)Q_`T9fTD;5 zDdgaO-Kou`?LzzXDnwp30en>n1u4lm(3K3DVWaU1`&~rx?Q|ZMSz&qINTM%kL24^B zveDmKIcI=r;AVIX(kTJF2d)9v^?IJf#~TGKB9(~t%Sm0J=`hBO^8cu@8cSYRyV+i? zD?e*+D(UJMTeT-fi{MC|SuSW`VIVU=E=;F0=#P(#9}w2(ajW^2g0+GyXL zSqJ%`)|;l|!dZCUDz)=SpR10nXsYJ>s0~aC( k0-b}7{42JLF4_?P0H#(vhRG5TmH+?%07*qoM6N<$g0B;%*8l(j diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index 0eb78f7c7341b7a4e8f2fa63bb42068ab72b1ae7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 953 zcmV;q14jIbP))n4Ni}Vxl$aDGpk&`o z-$|#_`F!rq-hiL<35!N;xSu1DtsT=t+36NWyh zR;%H1xm@R7h2Z2aF0Y_x&^a^|RfYF=46j^Ta({w%zbId>!LJv|`(6WJb@`AmOq9s) z3@(B`mgN%~(7_IWmpEo+2=F6<2z{5)Uc&PU^e40n9Vkwg6lXje z3}E%es=c%f8FD3s<4plp6M&(0=ria!^eY3oZyF1nM8L_yR~6b#aK6b^t2o#aW8Ofw z`894cr+WabE*mkA<*wR^0q}%s%I6Mqe-dLma4EUv6aapwt*}U$0|L9EIX(giFAWPZ z&;ToJ92#s3nZm}<3kHyj*T~6V`1wM)eFA+1-O`*t#Ke)o#u_$GIewG3MgHHgO4ZXk zpK2%OimFEE25K<2u}wZ3X}1NCr>b37=TlP&7@jJ>LoFRHU1~QMLQStgOSeg8Tu22K zb6S-!g{d=xU72HB(Qe7nudn(>}YJyET`(&62EQC*nOR z+nLa5Od@vL=h_}}u9eXyO63$K^TyII43sijBKdowl+lJOjYz|V`i9*$V2|5T_>6FH z3l3btfye;Vw}y@En0Pw%WW^|GOFk%{_m>K)I7dI{%361-zyXQbW^ zw&;)xlN|dz;PrYk$FgV3-O%^xbQWi$b6WuanvJ@MZS%SCJz1`QaJZhf6;encg%pyT b{1#vU%aSg@hL7wY00000NkvXXu0mjfhD diff --git a/app/src/main/res/drawable-hdpi/ic_read_only.png b/app/src/main/res/drawable-hdpi/ic_read_only.png deleted file mode 100644 index aca46301e9644cd1c78dc5eae5c4c3a7220bc4a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1438 zcmV;P1!4M$P)2;5i=~v_D4dD3^a7PqE*%(@gs2oGHr%8jpkSgV`eJ-CA(1y9NPJQs zcoKsqctH^nFik)npenNT&`_YY^ujH}04E;vpaAc0^ zng0rV97cZj8(ULYehy2S61ChxirJAsBCV5ZDxHp>OiJszsmd z7F`&mp^(8Yt1lsdBh-9XC?6ZOcJrb~o+0{J!ekbRQjXKeZ1R~a?#PRxjA^9vnQR}! zDjo}EeyuH|*qyUdJ8yP?o+iqLpS$vs_=#EMA*iH@Mi!Duv1p`~dKx(HH4R^)G}OLl z2{YWisMngzPVp*lu#|FfPxe^9iwM;eQp!m>SzvgguCkasg#1+$QOba5rb!MYaZ?Y(-`Y3KW7aSWWww2re!xayhA0r{ z_ZJ2&Lp&%~pq)OCgGNR)lDf{VCLg zm~-(XHB`7}Q$dg(=e(AP9IHi~Wg~+kK%3X%QU(BXs7O@|Ws(D+DATw@zr$jhXqUG{ zK0(gNp%g1x%&Fb1EVH|mA|>1Xqm+Bx2OynX(ZnU>=&el|K!1%|!bI$AO0JUQuuzo} z`nd<#sDk|5cvVn$6C! z0hELcCQ!vwEToF)1WZ?JmFaG8fcn5M<7S}OiIb`q)lU$X2!32 z2?6wMwo=M`%Ec*qv8jmSsSvVXS8F^@yGlD@ULDUS7crFxK?Nm^CZC_$W>L)92$L^= z6Akia95Wx(_Or;nf%sXW$>`f)6azgCebkE~18AicVvC`}BE%+-P}v+Z)+S^i^4Q>6 ze+F6XXD=t@l_XW~09Ed7FpWB`S8F!ozHnwSkszQF;y&l(zSJHefk(zh4ztqfPM{D4 zJB}CWyYQ1vKNkqd=JCDKj2wPo1rTOO;N!Svr`PfhJ$y?WebJYv6d|(M%R1f+e3{5U s-_}?ByC?1)E7k zK~!ko?U`$6990y@e|L7%ST}vQwoV@?A`ua7ayKEZ4+J3}M8Ei55Uhx3OCO4eTC`}f zwc1uh`auh#g@Ooz6~PYy3$4xWoW)wJ6-=w9&DJKZt)@+r?C$l0XX?0g^VrElF$abu zcV_PV&%OWiKj)snlug-`jk#HCM>O`Y16>Z%TAQ-griObij+wCnFCtiLrvZzBhk&NY zBT3+EU?1>`uU{G?OpRbYOF+a;hAI0q~Mmgsmd@REr9F=;!X;8y}G zE8O;g??hxZYITFqnw;D}WL7TO}G6hJPG=3l=8Eb8=7H!w7W8FZfh+K@$H=zfbGTIc&z|R9- z6p>>iU5s*TY;45yJc1w?I|>a$o3PF|A^1uG86EdLFC442)^4`e?z7fz$>nkcK|ng4 zzVd8yb940$Tt#h`MZjMIx`30wdm;F%t!!i-4NGcD9^AxBGM%y=SM1o>2w+q zISzcP8Mq&K7T6BV2JQw@BJvurMo)1G;FWAPdny{#qjexuneZCWgfyze7YWKGnmcv@ z9s2W0;C|pKYwbJ6m`-ENYGArCCKY|ZlEMu|q2D!g_A6b!3fmyVt$uTJGnq^#JTs?& z2H*}=t}lUYz;#-R9|T%~WzM+`#bR-DB9ZvnIrp%&HffB>l}e>cB2pTy11EqTkz_SE z($t^HWWrz9=`pfackxHf&I^GaW6Y)?2s*8``+=8%*4oFFVt%Y{mmaL&D{tG`~A zXM?VMpYBpEuu-Y|F7OHPp@BemIG!g=x%NJUe*LRPrG)#zy%%qLPXvk&(`8d zj-UlV6zBzG%nRD+I;tJ*rNCU^o9^!JJB=|LH7+gynUMbz8pIXK>2xBIIGV|1`V>^k zIro+Zc6TzFT+`m(KB)KR8)Lj|HhX5c#5obI#n6cW2+snPN+qMoaoS&{|KG)b5ClC# zDbIulaRsN0_LOb_PKihx|79EN|6Wenl>J}qPf43dyh|hhZ~y=R07*qoM6N<$f@ML- A>i_@% diff --git a/app/src/main/res/drawable-mdpi/alerts_and_states_warning.png b/app/src/main/res/drawable-mdpi/alerts_and_states_warning.png deleted file mode 100644 index f620ca52cdaf3c2bddb0757acaedf3be6138b1f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 613 zcmV-r0-F7aP)IpC5VU(4sM=aCJBmul>Suss;LMKZflXDtc+do_!Wyt+K|`DYpMj35 zj(-Fqf;nyi3lWnApsA{bMp1@@TR_jcSF=^Iv#p}eo)xKHL_PuUEZAS*J8%NL1ahG2 zoNK7+PZ7a;Kb{1<_qW7bw>uT!kE(w4-k&(Xhm$UfNfR1?iZsvB*9H1Rp-um&mN?`pp(6bO>RDp3Xi~Kw-^b2 zi%Z~_t;;?(9bnOXr6mwZXC0UxFuGG!Jyg|0;B>$^r_EPXmRTR!wSbi&vda?5+yz!d zq!p88B~tx!U>A6sAhmPbH-P#O`+vYb@IOo>yIZ}nc{V|2b>O|NdV>8daIXt76}$jm z4l!ISuPl&lWeltGnx5j=9`(b@Lvjwh_rk^aZ-wj zSXB{`KHxeq1za{8Ux8P^2UV@-x*<|60D2Y}0#YC`0H=XzU_wOZRCO!VSS2$0N5CbZ zVMk@)8?XrMSVpcm=a!svS&}4OZI?p;nDZfE1jxLj3&6apE&$JfO~3)8p(Q9sq<$Ev zHGSIwuG#w_FkodJ4mBFXfl3R~)`3Y883Qf?XH2Jd6aaR;+WXQ6T(#2V&vvNMm=b&e zezZCBdGX71dk)|xaITBaDPRTI2%V1A!1lWj+y#Dnd}uU9UbA+5sj68|=0K7ph{!nb zz?|oX-x>jPBCZ2(RCU2Q*9htVj-$9u8wYu*CKZ}yN@uc4+U<6{Uax;_Qov!pg~0@dGS8KwLAcfmQXM0 z^@7F>#_J%}i$PzJ{wX5ChCe~XT;n!$3yhIT>#jNlmY1A*%BanB`sRE z=TfQtu@7)wm&k2{a^0ewFAO9M1qm5UgUge-WU7GNDnJE{3~lyOcqY4HPcS}fR@Yhz z$3(`&rVJn8xjf_z2m1wFi4X~?laTRyTMkULxewzr7||ty=b-`MWZTO~iAK~!X|cg? zLDDP@3DT4OGbr-@ahvPd)2>&W>o`F8-LB&TU?V}g&231Ap8xBQC@$%Odk3)4T5RG9 gppr@sF24c{01P0jsq^4BjQ{`u07*qoM6N<$f<^ZV0{{R3 diff --git a/app/src/main/res/drawable-mdpi/ic_read_only.png b/app/src/main/res/drawable-mdpi/ic_read_only.png deleted file mode 100644 index b2434f76f86d196c038ec4e1776768e73d2d746b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 868 zcmV-q1DpJbP)kdg00002VoOIv0RM-N z%)bBt010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UA5`5GcJF`+fib0`*BmK~zY` z-IYy9R8bVifA`JUq-9!YH1jlUKoN4#c=aeMD6~aIRL~c-=!=LfC|guS(W=M@+LYKL zu%M_GQuJltB`xaJ4WfuX7&YlRkf5e%4bHsR!k0SEQ`^>EUCuq{fBxs5|G5|b`6ULn zdLC^?=Sa?4DjQI^FB=DJp8oIvFPLuD4jU{2xm1#ipVa{ZA0k!)fbQou`GnLA^^s}0 z0R-|mjzurfMLwZOeV<)%&RfX_pn`KQ*?n3umR!#rq9_Pr6lhBl7?_rNjWwhL#p*=$ zkr_|Op3Z(21xmO<9kWQoCQeu6^{2r2sE5Q=O{TCC*6l9Ryj<0SdXtM+e%bJ2stG0Jcz>%peh<42vIZrC3&S z5eplY)33wKr3HXJdX1hsEPytVQeuFhTr1-xQ4|izH(-2bsxu=SIWatgbwm(=pqFy_ z10QGP8%N-AW;rZ&>F4znmo{qY945o5+l$S0d2@)seKht7oKwc$WCl58I(<>O$1xrx zjaiiW&NEV>U(_e`S-t(|^BF^wHa>A)TJA5i5!Ul*zz-~B5}kue(DJC_8c#4~_sAcK u9;BXDmKrUI3M|!vfBP5dUfs|Cw0;A{pX}vDOtcUH0000Z{%Nt=6|L|Mg${ga0x_ z5s{+bqfWeXB34yIq!L&Jv;nitMh|cic%rJ=f^HnC7=qJBfqLL4;F|+gzz(2QMA}s~ z9oJa0%;*mQ(}BDlC4gSwKJd*lGT%A(&^Z_QzF*RIB8~%gc|9-#2tr4bfRn0v4Y&Y& z0vs?aZV3`)q<$JuJ!tP6u+Y9I0OPEz)8ZN}2Ls6>pv?kXMPw;36{sXC4uKUDj$ zR054wn!?J&HCj#y-UDAE&ce9JneMPVumq?pp)&?}27HXmjukQ6Z!@p~7zp7ZKPd8Q zYsU^%4TgmWeBVbzRsvh>@`B+92EYOkKLEE>^_p`oAE*C+OT`h92S!4NRJF_W3TV$3 z>-#vAoQx6qj}Xw>Rkce*@O>ZO_XnJF1K~?VWUh1WvU9FpRUe0)DVCW;u@P&Lw;A96 z0L}x)fUdz&S*A9L$ST{a0{VbjvsEJ^J58^22}EQuu+J_|8`ob@)l9LJipWIZtg&DZ zFb8-JOaZ!qdB9BIjH+HQSpw%=GqAv%yKF1xoGV&S-}n2SbKij#K&NFY3EVaZwp##~ z;_^Tt?OEWfs!~`{e?-RpFM%6C2e1t|ZROYl)HF3UB>|e7n@g6U)(GdjO}8Kl$s)2I zSPe7)_kdY84^9AUfZd5iqBWn-p96Y5&%2sRr8*;t$ZFhYAd1sQbynX>>yjGav#O>= zWdE kRlEP$b8XZ=+5VdR0ujSAgp{^u?f?J)07*qoM6N<$f@#^2L;wH) diff --git a/app/src/main/res/drawable-xhdpi/alerts_and_states_warning.png b/app/src/main/res/drawable-xhdpi/alerts_and_states_warning.png deleted file mode 100644 index 126fc78e321c64d78d34c2cf96614cb5c7d97d73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1020 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 diff --git a/app/src/main/res/drawable-xhdpi/ic_read_only.png b/app/src/main/res/drawable-xhdpi/ic_read_only.png deleted file mode 100644 index 43d966175793c9669525d4b9f8a927eeadb877b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1895 zcmV-t2blPYP)4wld%Z%ck>5UW3$}e<-I>4^RwAZGwGbA z5k5+r95n;uGT_$pB5k7=2l#xcEI5jVJVgdS;^r-$(HDbDR>=GUUdoz>l|1jxFVX!t z_tHl^tQmlEzEf}uT*X)TYT*8STJ4TvH^Q-`Oy4pmOqX_X( z>|c86Nb_^p#5!q~3ueF^mmU@}i!_ZakORh-9u`xTwb!i=k5hA-qSxFw-RPu-pzE@2A9}q|H?~+ zc0a{F-sL_NDVkX+XY^&+Pc4n4X_9jDrWueH<^qFkF+)WI@G{;mdj@OrSjfhL6O&p| zddS=~y=I%#QxC*hFTMJL9AY8Wq_IVt8}cse$?yw(wurMJ0AicK1r}*sIjb+oepZuUItg>gT#--n8?B2vj6x8$+ZCZ$7_AFVJL~a@)4+q0 zl0K6*mqfFQGJMv^VSPp3VlB`j+e})@dCf2Z0O0Mkg(V>tR@7DCj-GcuK8v|e4x3x% zh8$ouWu#do-TI2yG~jdAoR@#-sN<;^0N`!6>sTJFj@AbM7@6#KhP(K<9591sNDi}> z7?otq2|2+dz&qx&8AErhxMRlN!8BR}EW}j3-_J-u*D5(^2F(pQ%}QXAdBu##LQeBX z<1;w`UdHRRYgm!Xf~vGy{Np(+K%9@sUNdYi$vxCy$#v5!{dDQ{*qVz30AP1;jZX&u zt(yFkfl42vMfRJt9N`f%Tr|hbRg)>C)hZr9a)jsn?V*NhPV9+*6FyC}f*#}z6yEq+ zOJD%%+B5U8RBa#}V@iCF;T#CdWS1F{tDMn$rxbwG&U%%?Q`1ykfQ3q{*6+`O0CP-_ zxnj;1qcv87`E|GR-uG0cst&MFp&I;C*>LoU%im18IK5W!-hU8mnLYlIP%Ko%9;Py< z)1FqWW3ke_&q6RN919gn{L^GmjIc$&KZO9CcGeRjRQbNA;;J^VmauH!<1$a{OT|Z4 ztaR_QES!&EVXk`W;5$<|9XlI&oMC*3oOG~UwKTLeKy`9>${3Jy93@49>y$-3>z`LM zRaL-^G9HR*+$O|;GfQ8~{%+&TL>5)$T45HFJeE8=X$G9R{6H20)iSvP$CX&uB3tToYEXpShN5IG4JlL68U z)8@={lh)@-%b1Am!GvK{y z$3sp0JU%f#3u6Olr#2_`X0c2Tnqe?nMp&8+$2eQ{+oK!5hw{)s*T8bS!@D+tEpTSD zG7$3_>Uhq1z$ph#W?`rJ(SOWCGQ}o-98$EFx7=wHiGj~>GcVLKe4WPtGYTNiPd+dY zko1$Ad7j|pG?S#;SRw!?!J^2V&u~BJG^bEO?{h$WiDyGg%Xn$*7d_DoG-jvSFblPg z059izpCjL6YY4u}@7<;nf>7G28AExRIVLHW*`xalbkH4n88M&L(HRkotbk82RzFjQ zCHwSn?mLdi4!VmOc^R=HsyaphkcVlGIQuMaagG=C?@X$wIikZZW8L^H<64Uzvem?KL6sVesS{O3|z%CIV^PZXwnpj0ePGT5_I!h zw(Db4@zKJ=?jpe|6tIu>WPbq$oH$S7@fUrSDHT`oG~dnlKEDFQoC-b^ai_cAb{Fv9 h6jyOa?#Tb9{2OSllaQM4uAl$_002ovPDHLkV1mYKcDn!o diff --git a/app/src/main/res/drawable-xhdpi/show_sync_settings.png b/app/src/main/res/drawable-xhdpi/show_sync_settings.png deleted file mode 100644 index 64bcc5f7d9d19e0bf2ca04cd83d56d828d7f5c6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2038 zcmV`e|L8MNSxMg+)_L#xFCn1C?t;WY+^RWX?Z0<>W4~IC4~5f010RX zZBzkmh(b$1^g%_xAcR!GhYE-)9)UpA3K5E9<2fV_Eg<5i35dFh+dPOLYkNJH4|}E= zESs+F-OXCvBaOV8$G!JF{^xbCp++^TQH^R;ql%KXwy1lRAX90^MI`>c61WC%Kwd=7 z&-LE27eLI6wblc!2R;hCAGj8X60bU-7x+E!l8EFhAqZ0;%{KvG0B#0Svlvg3r-FD5 zcuGY6QEnlm%BlI`;bE+`Hv@ZB`?03yqxjiM;1=Ka&xy#tm#qa@Yi|Vh={#-&X> z99&icP>iedh{z&;V#uNHGMp`1G4 zv*ikvri|wQ6fjwY0{$Q(Kb+(HAEjH$(1Y~^Q9|7uo-~Sk}V;%_oad>!mtd#3bS3zwQX_9oeI^}2{=3S9~ z<*ExH56mp^8&||P6F{!&eSnBK;Gbm}djc3=E>Yl!hPYC$^OT6pRJ{PSdK&^>E@7gT z27XfYc|fA}{{Zl=MHWDFt?_3fGEvp3@GRy(St8~EMzlVdDo0-+T?Xbq1B{hOIpe@% zA~IF380?in^QBXg$n$N2_-=Ni}6>aU&;AoG6_DfcY@*=@_v9&Mw9bw{6>2pUdTb3H(QItv1Fy0Uwd5Q(pV2l|obuExq2J^G-Pie+BwotR5r!BTmAyBW(TlncLMLFu+28&dEQS4 z1_qwA*8Up!whl82JkiGUb!6wnw&(FaSO3F_g7jk7AZ(;_mwlq6^S_U(+0j^0G! zn9Mc`Cr3Qsl4gCaYTl6w;Kw3z&|146=+JefMC1-@?VakV4RFR7^CRcnC0*y_l6-(V zxuf&t2aBbNi3tz*ibk18HSd7SB687MyGt3GF~&R+hT$MUI-PzXpU>|H-VHQmGMSs4 zbI&>FKCQy@opWE+gy}wwE~WPYC93M;5SC9^Slsz-(|gm-xmPi%{%IyS~L@g~X4!EfOf#yU+X$XR#&NFMFfkt4;$@vA}VOD?Thvt~dY;WfZ3A~NXv zzSCr9R9k7cCA2zejM?M+z5zZ#;WWzkMC4F%{4;0HR3`*x`;ssWCxHRg>=!ec%nho^ z$JMz_a%F#T*z>&m!Z3W@Ik!{&#U;=4{<6^dt6_JTwQJYX*4Adm#>V1^a5;*i$Achv zBn-nt*4pQR)r#*+Q52mO5ofLal3GX}XmZXqQ8;5*nXYgNAwXAGSJoJ_dsfYH9q?P= zSHJ~*w!#>5y>sqvb)L!h>wvo!vX5Y@!2+zcn}9uu)Y_@WC%CfRKB3R+fcU7)wF-@~ z1f++IF?$qJ)f)z5TDNW;A~HzfXk6S@8*XiF-9h2_+}~6PjTBCh)}wm|Q51c|7_(PP z@dg#t(PEje3Jb_)vy6|AlS-vL;C^GwLFe3yA`)pws3D4?{lGikShO*ZhGE#3u%H%W z%nsmW7>0k|v}qHAgM-Tl0!2XN9-v1dkOOv$$g2RGH*e)*5_Glxm8M2Ds!@$<^j4t%0?4j0 U0zg+iiU0rr07*qoM6N<$f_f_4xBvhE diff --git a/app/src/main/res/drawable-xxhdpi/alerts_and_states_warning.png b/app/src/main/res/drawable-xxhdpi/alerts_and_states_warning.png deleted file mode 100644 index c858e04714ac253af45c8d18170e74f6cdb60eb1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 912 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqGdDMj1i#3PxeN@?zjI+`LBWN;4YNeH7&|RHraHZB*2x>{neV^(Ro(Y- zNb**HUtPW3DwjvVi9@jkK}=Y%rfBbnyLsV^74Pf*Ca$#&Y^XSRpZP`HpP#e0e$(83 zKFNru?xWWS#s$Ue0~-#MD90~maQa+V`c!vnH9u=WLH)GI1f!z=f(_?o;&*%xVmSC< zJ>wN-zLj?kMI1WB4oqlR2Vx!gE6wm*u>IZLjUcwv@t}sgdE55}mfc%a^n3wB7oVRM z_dB7odS-`1dtYzT39r3Be+J{fgZd0IEdG@qrSmneYOausDEl>KDKG1X;(F6fZ@y@H zYjZt#{!ixo-2Dvi9KAiJhvo5been8_eD<=h*Ke16A*1H=dCyNq{r=iE;k)^!6$Qz* z2F(BTtzUOIUt2k4=}I5Rw@$}={29WfvffvVU%kC;U2cX`H)cQ^C5$j3_^ zeZXIPMxw|uPT!C@>%_b7J+4hrd2 z7I0Xw+jq0h-89{X=rctn|L^N?>{V#5Q+fH@UvyIHq8Ak$e|{8+Uiiz};6F3O?)naf zA31AnpPR9o8gu+Bj+A=y>F0;2i_*n+D=SwTBF8hUvl&3qu8m8M`|k%~fFGSJfD(Bb|a8yy+gz({FJH@J|U6uMAX zDygXhMh0?`+$_IpJHF4k_d#t^+sXT!?>nE*1tEkGLI@#*5JHIBXf^RepPij`f$q}F zGay;~;+&I!ibEd)1E3FdHvDMPEca4?Aohj3W+%A#m)+|B06{04{fE;Sx|00}G>?#!f{9B#T+V%z%LVXazXu z5(5GrWAB2dF(2Q8fJwk(rv$!V9J_#V^rIj@Sr$S<2K&bQwFxK@ ze#U%h$uaX)(z^~yj&_XUTcWM-o7n~J68;$Ywe;G(BCogzZy;5{-D3?95+DJ> zu7HfNOAezJ5cS+nU8A784ew19{+0YU;KKuCZD2nmn?Apwo! uND*+u{F&ngGeshV5JCtcgb+fA1LYrz!UJr1@D&UI0000NHaz<2#8664H95#fe=$06vQx7mXHD!1W44Rz@`casE9pt2I)*i3X~bU;7EZ4 zLi(QiF5ReiyQ}><-P!M(*^%ws-tE2b?R#(EzEy-^Fc=I5gTY`h7z_r3!C){L323-oP94y z0c_SSn9^|e1>UM6NSMNqgqirSV!=dUGg=pn6wjZMIT?|OInbE1G}0Q-y5q?T=I_FX z@V!St17UNj-HE^=KOJgc*4G@F?iG;itpQ3Q2JdM^#JB$PS_Q{0hp@TD# zu8lQjXY5;6A$P=HlLr6K`O;@oV{xM z%+Ms5j%A#q3_?-{d2Gx1pFt=&1>FInH%qa+e5DIax*l1k7zT ze9h&A%{xOtMigW!Snr1`bT(e$Bj%MQfL6PC1WXJTMn0iicVtFAJ{E)PG(krSO;o*D zJA*t|bajrGOkZtjyxmF?K>Gt()4pXe15gNi9>=n;NqfW!`+uN|+DbOo9v}tO` znrLX(M{G{Qd!o7QT4AP;xT63wG7JGUWmVc6NgDN5XTn^xPbxuC32#ihVyd$U_;1G{ zNO%xH_&tM5V~UP#NRWzyb$!z;r>>$S3PFO;vJ~9jduAGDHX04oyuS^0qOhC< zYkD@IVL8c1oz}y3KZt+JTXe$0y3T`OQ3b?!W2zT3b<0zB>()?#DcB^B76toGv zP)F!%ftp0bchIm1>?8D@OF~D%JSLO#$l&?77<_|*gnmzj`B`MIB>38tx5=O2PE?1S zai7eEPGf82+`A-rmsChv64R7SqAAjHcIUj27au^W1)ISfqOF$pZ;Q$iEl$ah={d6K zpZKbh_UVLew(M#|LXB3Op-I4dFE-Xm_{YMo63^TAq&FuF_Amjv*b=K($bGV@I1}LW zcliB#;lDl~lmyT$ur2#W61vd;FML6Yj>cpn>INZV<|2!n?IL0!hx;S6hql26-0N4LG7IsA zP3J;=I8NsiaP=FLqr@3CkZOopLVcJn4F>)Y(#F2W10Mt5!YcD2y;OtGvo>&+4(cU} zYj(tHb)R{-2vHlfj$^8*l^;k`r}X=dMmwiO#>C*TcUmRg6zV;I^!bs2uR(HOR_2(h zB#1Q3!xzPjW1J^I!-{6z!q3EMXI5HE#AThtd>LwECiGVo)TM=*$@RVu=NX%{jB&Jy zj5tJ1XdwhR61VS>2qVF-1Ev1nP{%XJL7k^Bl>PgHek;j6?kxe=j{T=)G&_|cz~In? ziR~9mfE!#0m@onEuodDgbWzp4Ab@Omau>C~Dl;HWMKA#sGegrVyja!#0|!hI==K^g z6+N$l{bw*33U*sWPNKYUG1*8m%ucs8(|T);0i_Tr58a~t%n};;2uQq;K55T zy?E%QN_(haK|Cnvit(`iiNp-1hc0!X2D-DnR68xilBm(HhfHQO$^7}vzpY5#ab}Wz zpS<^dzxR8;Szv5q8{62%Hny?dJxh2$QcPCw?1U?F9y7=R*uVx5+#zT!QBu5#l3hLZ(=|85+?qy#RBi|b7lJI&>&Ux2AYp-Y)&c-n+>Z%C&S3>P&&Tp^2q{7LV?dDS zaRM2kNAsj{(+5CtH(nWWKXL?;a2+jVkrsG(j%wTy2ACqehQqdB6d?lZ+~7K|l7`Gs z2_3aGB(4hsY__Iu;W0cM4}vVw0;Q?bFOb~i3aOYKDWq1*QN=C>4jS0JI;F*fAWL`y zC6us4IZF4%$vT%w!nEs0b#C~mLh&HT65cTD&Lr|wBE2t9zDyeCToln@)z>-@2LjDu z#!`7C6lj(%_0ox(w2nj02wd^G5=W1~O74m^_bn4^HTSDS3pnxTs zB^ZwCR6%AS4%-NtO+~6Gl>qIu0Kz?xy`muJ@HQsQj5li!cezd-%#9*Y0|m>v(8hcA zjde;aZ^I=LWguBv1_=eq(K>elZje5ZFnPMfEr7e!9=O`ZX{Q}pN>qBASEn>Qhdn_O ziCbLfRnn0g_*EzSy*_IeggL5k7hsJ_=F=CH%K>*}LkK^GNhH>|OdT9BBO&2XuY6h% zB&2)gl3*lPSy>Idr5r){4ljyFL0+K}<*2p2r{V_HkTY91vwX5f3C#5OVZE-0T37_2 zDrZCNiANA_h(|$QMjlyAV}WL=V>S#Ot_(N}_>s?0C%Va;FSBW*e8Iv zoaJTA53IEXnkB6t308-MyUs0u*0EruSB}2sEnt`AXB+_(G38WiPZLW!V5)i;63cC^$xQ*X!?_~xM25Zj* zR{++H>i-EhV+L@Sb7CLv6GBkUq{$k^GmB}QQ);4KgaB|)q{P0&BaVqQfIuo1jjJ72 z0qR1vZ`)!32$e{g-jsnm+iBEGBDXo*s3pS=N2;rM2@ccC#ANaa?sNFyyxjlg%V-Dx z`=J4V>J=Q{y6SLqPwJQ>!cjR307@H|jGpuE0093ybm!--U!4$=Pba1v2Di&*41f)s z5AwHD;oX;)F^|^P?L;PVug{8oquCxS%_8$oMNNB~#&J>)!)ND;Un2*A^Q4>=o&v>t`~0RV*D_twJR#QU}N zD7t_|Oz!vW;pCyjgAVs@qFB8e9>8xeREO^4Y3)u8e>vQH0M+87JDx(^9Y+*|BS6P62_TIuvdAKB>}Yk%0fpPT@I&$m$7x=OCz!&Iv3q_~BGoHdnK`WAI87+-mG3BdV#5s@sY#V2kcJ&GlJ0b)w zs)8v*qpyTzXrll61#6b6|ET+?dy4ThoR1Vh&SSyma&7>j!xd7Iv#Cj@`(D$$U|LA| z5U?!*speZJI%Nh9E^OS710fkez!ov%ZFy#3d*b1~*C@=toRfhBY}uA$MP89}Hlrz9 z_l;3lWO5b(@a{injAt|v_YH*O_`wn3eDO$R8gLNsu>H*yfV*aE;p%>rT1W*J@bG-6 zcP!UMUc~+A5K^83enBvny<@qXC;%evM}^=4Ku1Ojqhkzs4d55#G?lqiO zz6dv<4TInUKnosQ6&;`9yz-;JoR1p84d7K50oQRsxyX%hgIS*l>gF{c0P>7^emk5r zt2n2uv5v^i6#@8WO5NNVzPQU*3#a0HKZnr%t-4wS-ocY2H?H9nKDYaCs+6FB+o<7; zQVuKDfKj-HQ~03zhu!nL1UgV1pW;#!ljML=aB<%mpr8L0e6Oh3VY48(y6=!e@(dQC z<7=E#DshO_M|Dq_WFa1vj-yZ;}zVy?IwV;kGp#x}OG{h#e$Zv5A! T&KWc200000NkvXXu0mjfH;u0r diff --git a/app/src/main/res/drawable-xxhdpi/show_sync_settings.png b/app/src/main/res/drawable-xxhdpi/show_sync_settings.png deleted file mode 100644 index 209f8917832145e211f68508d1c50abe88dd8807..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2745 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 diff --git a/app/src/main/res/drawable/ic_remove_circle_dark.xml b/app/src/main/res/drawable/ic_remove_circle_dark.xml new file mode 100644 index 00000000..0593dbcf --- /dev/null +++ b/app/src/main/res/drawable/ic_remove_circle_dark.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout-sw720dp/settings_activity.xml b/app/src/main/res/layout-sw720dp/settings_activity.xml deleted file mode 100644 index 092203f6..00000000 --- a/app/src/main/res/layout-sw720dp/settings_activity.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/account_caldav_item.xml b/app/src/main/res/layout/account_caldav_item.xml index 2b753466..23e5cdeb 100644 --- a/app/src/main/res/layout/account_caldav_item.xml +++ b/app/src/main/res/layout/account_caldav_item.xml @@ -52,6 +52,12 @@ tools:text="Calendar Description"/> + + - @@ -44,4 +44,10 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index b905bc32..f4472d59 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -47,10 +47,10 @@ android:indeterminate="true"/> + android:choiceMode="singleChoice"/> @@ -86,7 +86,7 @@ diff --git a/app/src/main/res/layout/settings_account_activity.xml b/app/src/main/res/layout/activity_account_settings.xml similarity index 63% rename from app/src/main/res/layout/settings_account_activity.xml rename to app/src/main/res/layout/activity_account_settings.xml index ada2f741..5b140ade 100644 --- a/app/src/main/res/layout/settings_account_activity.xml +++ b/app/src/main/res/layout/activity_account_settings.xml @@ -1,6 +1,6 @@ + android:id="@+id/fragment" + android:layout_width="match_parent" + android:layout_height="match_parent"/> diff --git a/app/src/main/res/layout/activity_create_address_book.xml b/app/src/main/res/layout/addressbook_properties.xml similarity index 60% rename from app/src/main/res/layout/activity_create_address_book.xml rename to app/src/main/res/layout/addressbook_properties.xml index 1905e105..58a180e4 100644 --- a/app/src/main/res/layout/activity_create_address_book.xml +++ b/app/src/main/res/layout/addressbook_properties.xml @@ -12,4 +12,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml deleted file mode 100644 index 4423b86e..00000000 --- a/app/src/main/res/layout/settings_activity.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/menu/activity_account.xml b/app/src/main/res/menu/activity_account.xml index d649c7ef..c9ffe890 100644 --- a/app/src/main/res/menu/activity_account.xml +++ b/app/src/main/res/menu/activity_account.xml @@ -10,6 +10,11 @@ + + DAVdroid Help + Manage accounts Please wait Send Skip @@ -28,6 +29,8 @@ Welcome to DAVdroid!\n\nYou can add a CalDAV/CardDAV account now. + Synchronize now + Synchronization has been scheduled Account settings Delete account Really delete account? @@ -128,9 +131,8 @@ Couldn\'t find CalDAV or CardDAV service. View logs - - Settings - No DAVdroid accounts found + + Settings: %s Authentication User name Enter user name: @@ -167,16 +169,6 @@ Every 4 hours Once a day - Debugging - Potential security risk! - Log to external file - External log files will contain private data and be accessible by other apps. Turn off external logging and delete the log files after use. - Logs are written to %s (if possible) - External storage is not available - Logs are written to ADB - Verbose logging - Log synchronization information and network traffic - Log only synchronization information Android version update Android version updates may have an impact on how DAVdroid works. If there are problems, please delete your DAVdroid accounts and add them again. diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 8999c529..1acc47e6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -21,9 +21,9 @@ #ff6d00 - #ebebeb - #000000 + #888888 + #ebebeb #ffffff @@ -33,6 +33,9 @@ @color/light_green500 @color/light_green700 @color/orangeA700 + @color/black + @color/grey + @style/PreferenceThemeOverlay - - diff --git a/app/src/main/res/xml/settings_account_prefs.xml b/app/src/main/res/xml/settings_account.xml similarity index 75% rename from app/src/main/res/xml/settings_account_prefs.xml rename to app/src/main/res/xml/settings_account.xml index 83a036f2..4a287c0a 100644 --- a/app/src/main/res/xml/settings_account_prefs.xml +++ b/app/src/main/res/xml/settings_account.xml @@ -25,7 +25,7 @@ android:summary="@string/settings_password_summary" android:dialogTitle="@string/settings_enter_password" /> - - - - - - - - - diff --git a/app/src/main/res/xml/sync_prefs.xml b/app/src/main/res/xml/sync_prefs.xml index 5c1aa923..482c03c4 100644 --- a/app/src/main/res/xml/sync_prefs.xml +++ b/app/src/main/res/xml/sync_prefs.xml @@ -9,10 +9,10 @@ - + diff --git a/dav4android b/dav4android index 40aef8e2..67a8b968 160000 --- a/dav4android +++ b/dav4android @@ -1 +1 @@ -Subproject commit 40aef8e2d5219c7595229a225c497c0e7237ec1c +Subproject commit 67a8b968f9ed565d2091f78f252cd0475247bf6e