Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade ClipManager (from deprecated version) #610

Closed
wants to merge 2 commits into from
Closed

Upgrade ClipManager (from deprecated version) #610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83f498c
Upgrade ClipManager (from deprecated version)
fat-tire May 27, 2018
f00e0b8
Merge branch 'master' into update_clipboard
fat-tire Sep 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/main/java/org/connectbot/ConsoleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Dialog;
import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
Expand All @@ -58,7 +59,6 @@
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.ClipboardManager;
import android.util.Log;
import android.view.KeyEvent;
import android.view.LayoutInflater;
Expand Down Expand Up @@ -1274,8 +1274,8 @@ private void pasteIntoTerminal() {

// pull string from clipboard and generate all events to force down
String clip = "";
if (clipboard.hasText()) {
clip = clipboard.getText().toString();
if (clipboard.hasPrimaryClip()) {
clip = clipboard.getPrimaryClip().getItemAt(0).getText().toString();
}
bridge.injectString(clip);
}
Expand Down
8 changes: 5 additions & 3 deletions app/src/main/java/org/connectbot/PubkeyListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@

import android.annotation.TargetApi;
import android.content.ActivityNotFoundException;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
Expand All @@ -58,7 +60,6 @@
import android.os.IBinder;
import android.support.annotation.VisibleForTesting;
import android.support.v7.widget.LinearLayoutManager;
import android.text.ClipboardManager;
import android.util.Log;
import android.view.ContextMenu;
import android.view.LayoutInflater;
Expand Down Expand Up @@ -545,7 +546,7 @@ public boolean onMenuItemClick(MenuItem item) {
PublicKey pk = PubkeyUtils.decodePublic(pubkey.getPublicKey(), pubkey.getType());
String openSSHPubkey = PubkeyUtils.convertToOpenSSHFormat(pk, pubkey.getNickname());

clipboard.setText(openSSHPubkey);
clipboard.setPrimaryClip(ClipData.newPlainText("Key", openSSHPubkey));
} catch (Exception e) {
Log.d(TAG, "Error converting to OpenSSH format", e);
}
Expand All @@ -568,7 +569,8 @@ public boolean onMenuItemClick(MenuItem item) {
data = PubkeyUtils.exportPEM(pk, null);
}

clipboard.setText(data);
clipboard.setPrimaryClip(ClipData.newPlainText("Data", data));

} catch (Exception e) {
Log.d(TAG, "Error copying private key", e);
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/org/connectbot/TerminalView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@

import android.annotation.TargetApi;
import android.app.Activity;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
Expand All @@ -49,7 +51,6 @@
import android.os.AsyncTask;
import android.os.Build;
import android.preference.PreferenceManager;
import android.text.ClipboardManager;
import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.MotionEvent;
Expand Down Expand Up @@ -341,7 +342,7 @@ public boolean onTouchEvent(MotionEvent event) {
// copy selected area to clipboard
String copiedText = area.copyFrom(bridge.buffer);

clipboard.setText(copiedText);
clipboard.setPrimaryClip(ClipData.newPlainText("CopySelection", area.copyFrom(bridge.buffer)));
Toast.makeText(
context,
context.getResources().getQuantityString(R.plurals.console_copy_done,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/org/connectbot/service/TerminalBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.connectbot.service;

import android.content.ClipboardManager;
import java.io.IOException;
import java.nio.charset.Charset;
import java.util.ArrayList;
Expand Down Expand Up @@ -44,7 +45,6 @@
import android.os.Handler;
import android.os.Looper;
import android.provider.Settings;
import android.text.ClipboardManager;
import android.util.Log;
import de.mud.terminal.VDUBuffer;
import de.mud.terminal.VDUDisplay;
Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/org/connectbot/service/TerminalKeyListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package org.connectbot.service;

import android.content.ClipData;
import android.content.ClipboardManager;
import java.io.IOException;

import org.connectbot.bean.SelectionArea;
Expand All @@ -25,7 +27,6 @@
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.res.Configuration;
import android.preference.PreferenceManager;
import android.text.ClipboardManager;
import android.util.Log;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
Expand Down Expand Up @@ -257,7 +258,7 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
if (clipboard != null) {
// copy selected area to clipboard
String copiedText = selectionArea.copyFrom(buffer);
clipboard.setText(copiedText);
clipboard.setPrimaryClip(ClipData.newPlainText("copiedText", copiedText));
// XXX STOPSHIP
// manager.notifyUser(manager.getString(
// R.string.console_copy_done,
Expand Down Expand Up @@ -312,8 +313,8 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_V
&& (derivedMetaState & HC_META_CTRL_ON) != 0
&& (derivedMetaState & KeyEvent.META_SHIFT_ON) != 0
&& clipboard.hasText()) {
bridge.injectString(clipboard.getText().toString());
&& clipboard.hasPrimaryClip()) {
bridge.injectString(clipboard.getPrimaryClip().getItemAt(0).getText().toString());
return true;
}

Expand Down Expand Up @@ -627,7 +628,7 @@ public int getDeadKey() {
return mDeadKey;
}

public void setClipboardManager(ClipboardManager clipboard) {
void setClipboardManager(ClipboardManager clipboard) {
this.clipboard = clipboard;
}

Expand Down
11 changes: 6 additions & 5 deletions app/src/main/java/org/connectbot/util/TerminalTextViewOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
import org.connectbot.service.TerminalBridge;

import android.annotation.TargetApi;
import android.content.ClipboardManager;
import android.content.ClipData;
import android.content.Context;
import android.graphics.Color;
import android.graphics.Typeface;
import android.os.Build;
import android.support.v4.view.MotionEventCompat;
import android.text.ClipboardManager;
import android.view.ActionMode;
import android.view.InputDevice;
import android.view.KeyEvent;
Expand All @@ -51,7 +52,7 @@ public class TerminalTextViewOverlay extends android.support.v7.widget.AppCompat
public TerminalView terminalView; // ryan: this name sucks
private String currentSelection = "";
private ActionMode selectionActionMode;
private ClipboardManager clipboard;
private android.content.ClipboardManager clipboard;

private int oldBufferHeight = 0;
private int oldScrollY = -1;
Expand Down Expand Up @@ -145,15 +146,15 @@ private void closeSelectionActionMode() {

public void copyCurrentSelectionToClipboard() {
if (currentSelection.length() != 0) {
clipboard.setText(currentSelection);
clipboard.setPrimaryClip(ClipData.newPlainText("CopySelection", currentSelection));
}
closeSelectionActionMode();
}

private void pasteClipboard() {
String clip = "";
if (clipboard.hasText()) {
clip = clipboard.getText().toString();
if (clipboard.hasPrimaryClip()) {
clip = clipboard.getPrimaryClip().getItemAt(0).getText().toString();
}
terminalView.bridge.injectString(clip);
}
Expand Down