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

Merge pull request #200 from ashh87/import-fix

Browse Source 
Import fix
This commit is contained in:
Dominik Schürmann 2014-01-16 02:12:53 -08:00
commit f4f6e84055
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java
View File

@ -50,7 +50,7 @@ public class ClipboardReflection {
methodNewPlainText.invoke(clipboard, clip); methodNewPlainText.invoke(clipboard, clip);
} }
} catch (Exception e) { } catch (Exception e) {
Log.e("ProjectsException", "There was and error copying the text to the clipboard: " Log.e("ProjectsException", "There was an error copying the text to the clipboard: "
+ e.getMessage()); + e.getMessage());
} }
} }
@ -89,7 +89,7 @@ public class ClipboardReflection {
return null; return null;
} }
} catch (Exception e) { } catch (Exception e) {
Log.e("ProjectsException", "There was and error getting the text from the clipboard: " Log.e("ProjectsException", "There was an error getting the text from the clipboard: "
+ e.getMessage()); + e.getMessage());
return null; return null;

6
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java
View File

@ -59,8 +59,10 @@ public class ImportKeysClipboardFragment extends Fragment {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
CharSequence clipboardText = ClipboardReflection.getClipboardText(getActivity()); CharSequence clipboardText = ClipboardReflection.getClipboardText(getActivity());
String sendText = "";
mImportActivity.loadCallback(clipboardText.toString().getBytes(), null); if (clipboardText != null)
sendText = clipboardText.toString();
mImportActivity.loadCallback(sendText.getBytes(), null);
} }
}); });

2
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java
View File

@ -93,7 +93,7 @@ public class ImportKeysFileFragment extends Fragment {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
switch (requestCode) { switch (requestCode & 0xFFFF) {
case Id.request.filename: { case Id.request.filename: {
if (resultCode == Activity.RESULT_OK && data != null) { if (resultCode == Activity.RESULT_OK && data != null) {
String path = null; String path = null;