diff options
| author | Ryan Hansberry <rhansby@gmail.com> | 2015-10-13 16:21:02 -0700 |
|---|---|---|
| committer | Ryan Hansberry <rhansby@gmail.com> | 2015-10-13 16:21:02 -0700 |
| commit | c955d111897d37fc3a446b78d81ea7b88247af10 (patch) | |
| tree | 935e8a4120e6821a4aa1d5340f768b83d32ed95d /app/src | |
| parent | 69739ad34ae819e6d195ebd13d5bad804b4ac073 (diff) | |
| download | connectbot-c955d111897d37fc3a446b78d81ea7b88247af10.tar.gz connectbot-c955d111897d37fc3a446b78d81ea7b88247af10.tar.bz2 connectbot-c955d111897d37fc3a446b78d81ea7b88247af10.zip | |
Fix paste button being permanently disabled when clipboard was previously empty.
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/main/java/org/connectbot/ConsoleActivity.java | 9 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/TerminalView.java | 5 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 7c9ee05..abfbee4 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -779,7 +779,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne paste.setAlphabeticShortcut('v'); MenuItemCompat.setShowAsAction(paste, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM); paste.setIcon(R.drawable.ic_action_paste); - paste.setEnabled(clipboard.hasText() && sessionOpen); + paste.setEnabled(sessionOpen); paste.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { pasteIntoTerminal(); @@ -897,7 +897,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { copy.setEnabled(activeTerminal); } - paste.setEnabled(clipboard.hasText() && sessionOpen); + paste.setEnabled(sessionOpen); portForward.setEnabled(sessionOpen && canForwardPorts); urlscan.setEnabled(activeTerminal); resize.setEnabled(sessionOpen); @@ -1174,7 +1174,10 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne TerminalBridge bridge = terminalView.bridge; // pull string from clipboard and generate all events to force down - String clip = clipboard.getText().toString(); + String clip = ""; + if (clipboard.hasText()) { + clip = clipboard.getText().toString(); + } bridge.injectString(clip); } diff --git a/app/src/main/java/org/connectbot/TerminalView.java b/app/src/main/java/org/connectbot/TerminalView.java index 767a4a0..026fac7 100644 --- a/app/src/main/java/org/connectbot/TerminalView.java +++ b/app/src/main/java/org/connectbot/TerminalView.java @@ -405,7 +405,10 @@ public class TerminalView extends TextView implements FontSizeChangedListener { copyCurrentSelectionToClipboard(); return true; case PASTE: - String clip = clipboard.getText().toString(); + String clip = ""; + if (clipboard.hasText()) { + clip = clipboard.getText().toString(); + } TerminalView.this.bridge.injectString(clip); mode.finish(); return true; |