moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 19:22:14 -05:00
Code Issues Releases Wiki Activity

Show file tab only for import of existing keys

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-01 00:10:01 +02:00
parent 08ae9db4ee
commit afe56e08fe
1 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@ -100,6 +100,7 @@ public class ImportKeysActivity extends ActionBarActivity {
public static final int VIEW_PAGER_HEIGHT = 64; // dp public static final int VIEW_PAGER_HEIGHT = 64; // dp
private static final int ALL_TABS = -1;
private static final int TAB_KEYSERVER = 0; private static final int TAB_KEYSERVER = 0;
private static final int TAB_QR_CODE = 1; private static final int TAB_QR_CODE = 1;
private static final int TAB_FILE = 2; private static final int TAB_FILE = 2;
@ -152,7 +153,7 @@ public class ImportKeysActivity extends ActionBarActivity {
} }
Bundle serverBundle = null; Bundle serverBundle = null;
boolean serverOnly = false; int showTabOnly = ALL_TABS;
if (ACTION_IMPORT_KEY.equals(action)) { if (ACTION_IMPORT_KEY.equals(action)) {
/* Keychain's own Actions */ /* Keychain's own Actions */
@ -216,7 +217,7 @@ public class ImportKeysActivity extends ActionBarActivity {
serverBundle.putString(ImportKeysServerFragment.ARG_QUERY, query); serverBundle.putString(ImportKeysServerFragment.ARG_QUERY, query);
serverBundle.putBoolean(ImportKeysServerFragment.ARG_DISABLE_QUERY_EDIT, true); serverBundle.putBoolean(ImportKeysServerFragment.ARG_DISABLE_QUERY_EDIT, true);
// display server tab only // display server tab only
serverOnly = true; showTabOnly = TAB_KEYSERVER;
mSwitchToTab = TAB_KEYSERVER; mSwitchToTab = TAB_KEYSERVER;
// action: search immediately // action: search immediately
@ -229,11 +230,18 @@ public class ImportKeysActivity extends ActionBarActivity {
); );
return; return;
} }
} else if (ACTION_IMPORT_KEY_FROM_FILE.equals(action) } else if (ACTION_IMPORT_KEY_FROM_FILE.equals(action)) {
|| ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN.equals(action)) {
// NOTE: this only displays the appropriate fragment, no actions are taken // NOTE: this only displays the appropriate fragment, no actions are taken
mSwitchToTab = TAB_FILE; mSwitchToTab = TAB_FILE;
// no immediate actions!
startListFragment(savedInstanceState, null, null, null);
} else if (ACTION_IMPORT_KEY_FROM_FILE_AND_RETURN.equals(action)) {
// NOTE: this only displays the appropriate fragment, no actions are taken
mSwitchToTab = TAB_FILE;
// display file tab only
showTabOnly = TAB_FILE;
// no immediate actions! // no immediate actions!
startListFragment(savedInstanceState, null, null, null); startListFragment(savedInstanceState, null, null, null);
} else if (ACTION_IMPORT_KEY_FROM_QR_CODE.equals(action)) { } else if (ACTION_IMPORT_KEY_FROM_QR_CODE.equals(action)) {
@ -261,10 +269,10 @@ public class ImportKeysActivity extends ActionBarActivity {
startListFragment(savedInstanceState, null, null, null); startListFragment(savedInstanceState, null, null, null);
} }
initTabs(serverBundle, serverOnly); initTabs(serverBundle, showTabOnly);
} }
private void initTabs(Bundle serverBundle, boolean serverOnly) { private void initTabs(Bundle serverBundle, int showTabOnly) {
mTabsAdapter = new PagerTabStripAdapter(this); mTabsAdapter = new PagerTabStripAdapter(this);
mViewPager.setAdapter(mTabsAdapter); mViewPager.setAdapter(mTabsAdapter);
mSlidingTabLayout.setOnPageChangeListener(new ViewPager.OnPageChangeListener() { mSlidingTabLayout.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@ -287,15 +295,34 @@ public class ImportKeysActivity extends ActionBarActivity {
} }
}); });
mTabsAdapter.addTab(ImportKeysServerFragment.class, switch (showTabOnly) {
serverBundle, getString(R.string.import_tab_keyserver)); case ALL_TABS:
if (!serverOnly) { // show all tabs
mTabsAdapter.addTab(ImportKeysQrCodeFragment.class, mTabsAdapter.addTab(ImportKeysServerFragment.class,
null, getString(R.string.import_tab_qr_code)); serverBundle, getString(R.string.import_tab_keyserver));
mTabsAdapter.addTab(ImportKeysFileFragment.class, mTabsAdapter.addTab(ImportKeysQrCodeFragment.class,
null, getString(R.string.import_tab_direct)); null, getString(R.string.import_tab_qr_code));
mTabsAdapter.addTab(ImportKeysKeybaseFragment.class, mTabsAdapter.addTab(ImportKeysFileFragment.class,
null, getString(R.string.import_tab_keybase)); null, getString(R.string.import_tab_direct));
mTabsAdapter.addTab(ImportKeysKeybaseFragment.class,
null, getString(R.string.import_tab_keybase));
break;
case TAB_KEYSERVER:
mTabsAdapter.addTab(ImportKeysServerFragment.class,
serverBundle, getString(R.string.import_tab_keyserver));
break;
case TAB_QR_CODE:
mTabsAdapter.addTab(ImportKeysQrCodeFragment.class,
null, getString(R.string.import_tab_qr_code));
break;
case TAB_FILE:
mTabsAdapter.addTab(ImportKeysFileFragment.class,
null, getString(R.string.import_tab_direct));
break;
case TAB_KEYBASE:
mTabsAdapter.addTab(ImportKeysKeybaseFragment.class,
null, getString(R.string.import_tab_keybase));
break;
} }
// update layout after operations // update layout after operations