PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

fix clipboard null crash

Browse source
This commit is contained in:
Ashley Hughes 2014-01-15 22:37:23 +00:00
parent 9c0432d24c
commit 09caba36a0
2 changed files with 6 additions and 4 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);
} }
}); });