Evolinx/android_terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix paste

Browse Source 
Closes !12

Signed-off-by: Re4son <3520622-re4son@users.noreply.gitlab.com>
This commit is contained in:
Re4son 2020-08-23 19:42:55 +10:00
parent ee9426504d
commit c64ca1eb55
No known key found for this signature in database
GPG Key ID: B124ED68AA07EFA9
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -24,7 +24,7 @@ ext {
minSdkVersion=14
targetSdkVersion=29
//version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1)
versionCode=2020030100
versionName="2020.3"
versionCode=2020040001
versionName="2020.4-RC1"
}

9
emulatorview/src/main/java/com/offsec/nhterm/emulatorview/compat/ClipboardManagerCompatV11.java
View File

@ -10,7 +10,9 @@ import android.content.ClipboardManager;
public class ClipboardManagerCompatV11 implements ClipboardManagerCompat {
private final ClipboardManager clip;
private Context context;
public ClipboardManagerCompatV11(Context context) {
this.context=context;
clip = (ClipboardManager) context.getApplicationContext()
.getSystemService(Context.CLIPBOARD_SERVICE);
}
@ -18,13 +20,14 @@ public class ClipboardManagerCompatV11 implements ClipboardManagerCompat {
@Override
public CharSequence getText() {
ClipData.Item item = clip.getPrimaryClip().getItemAt(0);
return item.getText();
if(item.getText()!=null)
return item.getText();
return item.coerceToText(context);
}
@Override
public boolean hasText() {
return (clip.hasPrimaryClip() && clip.getPrimaryClipDescription()
.hasMimeType(ClipDescription.MIMETYPE_TEXT_PLAIN));
return clip.hasPrimaryClip();
}
@Override

6
term/src/main/java/com/offsec/nhterm/Term.java
View File

@ -1354,7 +1354,10 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences.
private boolean canPaste() {
ClipboardManagerCompat clip = ClipboardManagerCompatFactory
.getManager(getApplicationContext());
return clip.hasText();
if (clip.hasText()) {
return true;
}
return false;
}
private void doPreferences() {
@ -1721,7 +1724,6 @@ public class Term extends Activity implements UpdateCallback, SharedPreferences.
break;
case R.id.button_vim_paste:
doPaste();
//sendKeyStrings("\"*p", false);
break;
case R.id.button_vim_yank:
sendKeyStrings("\"*yy", false);