From a1c0ef48d294ad253cc6021c9c6957e43d613a19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 6 Dec 2016 10:30:30 +0100 Subject: [PATCH] Minor code style changes --- .../keychain/ui/KeyListFragment.java | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 9cfa6e526..751e1d2ca 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -197,7 +197,7 @@ public class KeyListFragment extends RecyclerFragment /** - * Load custom layout with StickyListView from library + * Load custom layout */ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -319,11 +319,7 @@ public class KeyListFragment extends RecyclerFragment } // The list should now be shown. - if (isResumed()) { - showList(true); - } else { - showList(false); - } + showList(isResumed()); } @Override @@ -380,16 +376,15 @@ public class KeyListFragment extends RecyclerFragment @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - - case R.id.menu_key_list_create: + case R.id.menu_key_list_create: { createKey(); return true; - - case R.id.menu_key_list_update_all_keys: + } + case R.id.menu_key_list_update_all_keys: { updateAllKeys(); return true; - - case R.id.menu_key_list_debug_read: + } + case R.id.menu_key_list_debug_read: { try { KeychainDatabase.debugBackup(getActivity(), true); Notify.create(getActivity(), "Restored debug_backup.db", Notify.Style.OK).show(); @@ -399,8 +394,8 @@ public class KeyListFragment extends RecyclerFragment Notify.create(getActivity(), "IO Error " + e.getMessage(), Notify.Style.ERROR).show(); } return true; - - case R.id.menu_key_list_debug_write: + } + case R.id.menu_key_list_debug_write: { try { KeychainDatabase.debugBackup(getActivity(), false); Notify.create(getActivity(), "Backup to debug_backup.db completed", Notify.Style.OK).show(); @@ -409,8 +404,8 @@ public class KeyListFragment extends RecyclerFragment Notify.create(getActivity(), "IO Error: " + e.getMessage(), Notify.Style.ERROR).show(); } return true; - - case R.id.menu_key_list_debug_first_time: + } + case R.id.menu_key_list_debug_first_time: { Preferences prefs = Preferences.getPreferences(getActivity()); prefs.setFirstTime(true); Intent intent = new Intent(getActivity(), CreateKeyActivity.class); @@ -418,17 +413,18 @@ public class KeyListFragment extends RecyclerFragment startActivity(intent); getActivity().finish(); return true; - - case R.id.menu_key_list_debug_cons: + } + case R.id.menu_key_list_debug_cons: { consolidate(); return true; - - case R.id.menu_key_list_debug_bench: + } + case R.id.menu_key_list_debug_bench: { benchmark(); return true; - - default: + } + default: { return super.onOptionsItemSelected(item); + } } }