From 1af52a1af5effa89733ddb4925832f4ba14232cd Mon Sep 17 00:00:00 2001 From: Ryan Hansberry Date: Tue, 13 Oct 2015 16:41:45 -0700 Subject: Prevent calling toString on null when pasting to clipboard. --- .../java/org/connectbot/util/TerminalTextViewOverlay.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/org') diff --git a/app/src/main/java/org/connectbot/util/TerminalTextViewOverlay.java b/app/src/main/java/org/connectbot/util/TerminalTextViewOverlay.java index d814f7f..be37524 100644 --- a/app/src/main/java/org/connectbot/util/TerminalTextViewOverlay.java +++ b/app/src/main/java/org/connectbot/util/TerminalTextViewOverlay.java @@ -156,6 +156,14 @@ public class TerminalTextViewOverlay extends TextView { closeSelectionActionMode(); } + private void pasteClipboard() { + String clip = ""; + if (clipboard.hasText()) { + clip = clipboard.getText().toString(); + } + parent.bridge.injectString(clip); + } + @Override protected void onSelectionChanged(int selStart, int selEnd) { if (selStart <= selEnd) { @@ -246,8 +254,7 @@ public class TerminalTextViewOverlay extends TextView { if (event.getAction() == MotionEvent.ACTION_DOWN) { if (event.getButtonState() == MotionEvent.BUTTON_TERTIARY) { // Middle click pastes. - String clip = clipboard.getText().toString(); - bridge.injectString(clip); + pasteClipboard(); return true; } @@ -377,8 +384,7 @@ public class TerminalTextViewOverlay extends TextView { copyCurrentSelectionToClipboard(); return true; case PASTE: - String clip = clipboard.getText().toString(); - TerminalTextViewOverlay.this.parent.bridge.injectString(clip); + pasteClipboard(); mode.finish(); return true; } -- cgit v1.2.3