From f3638d5b449aee5f8fbae7b7389d833e826c3786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 18 Jan 2014 21:17:23 +0100 Subject: default import is from keyserver --- .../sufficientlysecure/keychain/ui/ImportKeysActivity.java | 12 ++++++------ .../keychain/ui/KeyListPublicFragment.java | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui') diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 00a648355..698794e5c 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java @@ -146,10 +146,10 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi String importFilename = intent.getData().getPath(); // display selected filename - getSupportActionBar().setSelectedNavigationItem(0); + getSupportActionBar().setSelectedNavigationItem(1); Bundle args = new Bundle(); args.putString(ImportKeysFileFragment.ARG_PATH, importFilename); - loadFragment(ImportKeysFileFragment.class, args, mNavigationStrings[0]); + loadFragment(ImportKeysFileFragment.class, args, mNavigationStrings[1]); // directly load data startListFragment(savedInstanceState, null, importFilename); @@ -164,8 +164,8 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi startListFragment(savedInstanceState, null, null); if (ACTION_IMPORT_KEY_FROM_FILE.equals(action)) { - getSupportActionBar().setSelectedNavigationItem(0); - loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[0]); + getSupportActionBar().setSelectedNavigationItem(1); + loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[1]); } else if (ACTION_IMPORT_KEY_FROM_QR_CODE.equals(action)) { getSupportActionBar().setSelectedNavigationItem(2); loadFragment(ImportKeysQrCodeFragment.class, null, mNavigationStrings[2]); @@ -206,10 +206,10 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi // Create new fragment from our own Fragment class switch (itemPosition) { case 0: - loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[itemPosition]); + loadFragment(ImportKeysServerFragment.class, null, mNavigationStrings[itemPosition]); break; case 1: - loadFragment(ImportKeysServerFragment.class, null, mNavigationStrings[itemPosition]); + loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[itemPosition]); break; case 2: loadFragment(ImportKeysQrCodeFragment.class, null, mNavigationStrings[itemPosition]); diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java index ea088efca..b8a2d5c69 100644 --- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java +++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java @@ -93,6 +93,7 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte @Override public void onClick(View v) { Intent intentImportFromFile = new Intent(getActivity(), ImportKeysActivity.class); + intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE); startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code); } }); -- cgit v1.2.3