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

default import is from keyserver

Browse Source
This commit is contained in:
Dominik Schürmann 2014-01-18 21:17:23 +01:00
parent 5b5f66f514
commit f3638d5b44
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenPGP-Keychain/res/values/arrays.xml
View File

@ -50,8 +50,8 @@
<item>@string/key_size_4096</item> <item>@string/key_size_4096</item>
</string-array> </string-array>
<string-array name="import_action_list"> <string-array name="import_action_list">
<item>@string/menu_import_from_file</item>
<item>@string/menu_key_server</item> <item>@string/menu_key_server</item>
<item>@string/menu_import_from_file</item>
<item>@string/menu_import_from_qr_code</item> <item>@string/menu_import_from_qr_code</item>
<item>@string/import_from_clipboard</item> <item>@string/import_from_clipboard</item>
<item>@string/menu_import_from_nfc</item> <item>@string/menu_import_from_nfc</item>

2
OpenPGP-Keychain/res/values/strings.xml
View File

@ -310,7 +310,7 @@
<!-- Import --> <!-- Import -->
<string name="import_import">Import selected keys</string> <string name="import_import">Import selected keys</string>
<string name="import_sign_and_upload">Import, Sign, and upload selected keys</string> <string name="import_sign_and_upload">Import, Sign, and upload selected keys</string>
<string name="import_from_clipboard">Import from Clipboard</string> <string name="import_from_clipboard">Import from clipboard</string>
<plurals name="import_qr_code_missing"> <plurals name="import_qr_code_missing">
<item quantity="one">Missing QR Code with ID %1$s</item> <item quantity="one">Missing QR Code with ID %1$s</item>

12
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@ -146,10 +146,10 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi
String importFilename = intent.getData().getPath(); String importFilename = intent.getData().getPath();
// display selected filename // display selected filename
getSupportActionBar().setSelectedNavigationItem(0); getSupportActionBar().setSelectedNavigationItem(1);
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(ImportKeysFileFragment.ARG_PATH, importFilename); args.putString(ImportKeysFileFragment.ARG_PATH, importFilename);
loadFragment(ImportKeysFileFragment.class, args, mNavigationStrings[0]); loadFragment(ImportKeysFileFragment.class, args, mNavigationStrings[1]);
// directly load data // directly load data
startListFragment(savedInstanceState, null, importFilename); startListFragment(savedInstanceState, null, importFilename);
@ -164,8 +164,8 @@ public class ImportKeysActivity extends DrawerActivity implements OnNavigationLi
startListFragment(savedInstanceState, null, null); startListFragment(savedInstanceState, null, null);
if (ACTION_IMPORT_KEY_FROM_FILE.equals(action)) { if (ACTION_IMPORT_KEY_FROM_FILE.equals(action)) {
getSupportActionBar().setSelectedNavigationItem(0); getSupportActionBar().setSelectedNavigationItem(1);
loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[0]); loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[1]);
} else if (ACTION_IMPORT_KEY_FROM_QR_CODE.equals(action)) { } else if (ACTION_IMPORT_KEY_FROM_QR_CODE.equals(action)) {
getSupportActionBar().setSelectedNavigationItem(2); getSupportActionBar().setSelectedNavigationItem(2);
loadFragment(ImportKeysQrCodeFragment.class, null, mNavigationStrings[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 // Create new fragment from our own Fragment class
switch (itemPosition) { switch (itemPosition) {
case 0: case 0:
loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[itemPosition]); loadFragment(ImportKeysServerFragment.class, null, mNavigationStrings[itemPosition]);
break; break;
case 1: case 1:
loadFragment(ImportKeysServerFragment.class, null, mNavigationStrings[itemPosition]); loadFragment(ImportKeysFileFragment.class, null, mNavigationStrings[itemPosition]);
break; break;
case 2: case 2:
loadFragment(ImportKeysQrCodeFragment.class, null, mNavigationStrings[itemPosition]); loadFragment(ImportKeysQrCodeFragment.class, null, mNavigationStrings[itemPosition]);

1
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
View File

@ -93,6 +93,7 @@ public class KeyListPublicFragment extends Fragment implements AdapterView.OnIte
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Intent intentImportFromFile = new Intent(getActivity(), ImportKeysActivity.class); Intent intentImportFromFile = new Intent(getActivity(), ImportKeysActivity.class);
intentImportFromFile.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_FILE);
startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code); startActivityForResult(intentImportFromFile, Id.request.import_from_qr_code);
} }
}); });