diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-15 20:19:24 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-12-27 15:00:14 +0100 |
commit | 69220cb4c0466112426e7d10f865da834b464d90 (patch) | |
tree | 8831fa9b80ec3addf6c2dc0d0a51bf67efe8df73 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java | |
parent | 00e97586b06e5e61f6639b75423f9ec3edba47a0 (diff) | |
download | open-keychain-69220cb4c0466112426e7d10f865da834b464d90.tar.gz open-keychain-69220cb4c0466112426e7d10f865da834b464d90.tar.bz2 open-keychain-69220cb4c0466112426e7d10f865da834b464d90.zip |
inline subkey editing, fixed
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java index ce68bfab1..048dd4f77 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvSubkeysFragment.java @@ -47,7 +47,6 @@ import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyChange; import org.sufficientlysecure.keychain.ui.adapter.SubkeysAdapter; import org.sufficientlysecure.keychain.ui.adapter.SubkeysAddedAdapter; -import org.sufficientlysecure.keychain.ui.adapter.UserIdsAddedAdapter; import org.sufficientlysecure.keychain.ui.dialog.AddSubkeyDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.EditSubkeyDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.EditSubkeyExpiryDialogFragment; @@ -58,6 +57,8 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements LoaderManager.LoaderCallbacks<Cursor> { public static final String ARG_DATA_URI = "data_uri"; + public static final String ARG_HAS_SECRET = "has_secret"; + public static final int LOADER_ID_SUBKEYS = 0; private ListView mSubkeysList; @@ -76,11 +77,12 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements /** * Creates new instance of this fragment */ - public static ViewKeyAdvSubkeysFragment newInstance(Uri dataUri) { + public static ViewKeyAdvSubkeysFragment newInstance(Uri dataUri, boolean hasSecret) { ViewKeyAdvSubkeysFragment frag = new ViewKeyAdvSubkeysFragment(); Bundle args = new Bundle(); args.putParcelable(ARG_DATA_URI, dataUri); + args.putBoolean(ARG_HAS_SECRET, hasSecret); frag.setArguments(args); return frag; @@ -91,11 +93,9 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements View root = super.onCreateView(inflater, superContainer, savedInstanceState); View view = inflater.inflate(R.layout.view_key_adv_subkeys_fragment, getContainer()); - mSubkeysList = (ListView) view.findViewById(R.id.keys); - - mSubkeysList = (ListView) view.findViewById(R.id.view_key_user_ids); - mSubkeysAddedList = (ListView) view.findViewById(R.id.view_key_user_ids_added); - mSubkeysAddedLayout = view.findViewById(R.id.view_key_user_ids_add_layout); + mSubkeysList = (ListView) view.findViewById(R.id.view_key_subkeys); + mSubkeysAddedList = (ListView) view.findViewById(R.id.view_key_subkeys_added); + mSubkeysAddedLayout = view.findViewById(R.id.view_key_subkeys_add_layout); mSubkeysList.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override @@ -136,6 +136,9 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements getActivity().finish(); return; } + mHasSecret = getArguments().getBoolean(ARG_HAS_SECRET); + + setHasOptionsMenu(true); loadData(dataUri); } @@ -227,6 +230,14 @@ public class ViewKeyAdvSubkeysFragment extends LoaderFragment implements } @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { + super.onCreateOptionsMenu(menu, inflater); + inflater.inflate(R.menu.edit_subkeys, menu); + final MenuItem vEditSubkeys = menu.findItem(R.id.menu_edit_subkeys); + vEditSubkeys.setVisible(mHasSecret); + } + + @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.menu_edit_subkeys: |