From c64ca1eb55919dc64e0ca606526e60cd6d4a4fbf Mon Sep 17 00:00:00 2001 From: Re4son <3520622-re4son@users.noreply.gitlab.com> Date: Sun, 23 Aug 2020 19:42:55 +1000 Subject: [PATCH 1/3] Fix paste Closes !12 Signed-off-by: Re4son <3520622-re4son@users.noreply.gitlab.com> --- build.gradle | 4 ++-- .../emulatorview/compat/ClipboardManagerCompatV11.java | 9 ++++++--- term/src/main/java/com/offsec/nhterm/Term.java | 6 ++++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 3080593..a508e37 100644 --- a/build.gradle +++ b/build.gradle @@ -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" } diff --git a/emulatorview/src/main/java/com/offsec/nhterm/emulatorview/compat/ClipboardManagerCompatV11.java b/emulatorview/src/main/java/com/offsec/nhterm/emulatorview/compat/ClipboardManagerCompatV11.java index 61ae6a6..a17951b 100644 --- a/emulatorview/src/main/java/com/offsec/nhterm/emulatorview/compat/ClipboardManagerCompatV11.java +++ b/emulatorview/src/main/java/com/offsec/nhterm/emulatorview/compat/ClipboardManagerCompatV11.java @@ -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 diff --git a/term/src/main/java/com/offsec/nhterm/Term.java b/term/src/main/java/com/offsec/nhterm/Term.java index 53cfcf5..259b77c 100644 --- a/term/src/main/java/com/offsec/nhterm/Term.java +++ b/term/src/main/java/com/offsec/nhterm/Term.java @@ -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); From b444e42138e183b9ed5b3784f8e58e814993b6c7 Mon Sep 17 00:00:00 2001 From: Re4son <3520622-re4son@users.noreply.gitlab.com> Date: Sun, 8 Nov 2020 00:22:21 +0000 Subject: [PATCH 2/3] Bump to 2020.4 (2020040100 Release) --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index a508e37..0206d19 100644 --- a/build.gradle +++ b/build.gradle @@ -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=2020040001 - versionName="2020.4-RC1" + versionCode=2020040100 + versionName="2020.4" } From f86b69bee88ebf69902ae2276b59bf839c890a0f Mon Sep 17 00:00:00 2001 From: Re4son <3520622-re4son@users.noreply.gitlab.com> Date: Sun, 29 Nov 2020 13:18:35 +1100 Subject: [PATCH 3/3] fix CI build Signed-off-by: Re4son <3520622-re4son@users.noreply.gitlab.com> --- .gitlab-ci.yml | 4 ++-- build.gradle | 6 +++--- libtermexec/build.gradle | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad26a58..2e6b159 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: jangrewe/gitlab-ci-android:29 +image: jangrewe/gitlab-ci-android stages: - build @@ -84,4 +84,4 @@ assembleReleaseManual: cache: key: ${CI_PROJECT_ID} paths: - - .gradle/ \ No newline at end of file + - .gradle/ diff --git a/build.gradle b/build.gradle index 0206d19..a0616d1 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:3.4.0' } } @@ -20,9 +20,9 @@ allprojects { } ext { - compileSdkVersion=29 + compileSdkVersion=28 minSdkVersion=14 - targetSdkVersion=29 + targetSdkVersion=28 //version=YYYYMMVVRR (Either "VV" for stable version OR "RR" for pre-release candidate (e.g. 0001 for rc1) versionCode=2020040100 versionName="2020.4" diff --git a/libtermexec/build.gradle b/libtermexec/build.gradle index 3403146..1723ce3 100644 --- a/libtermexec/build.gradle +++ b/libtermexec/build.gradle @@ -4,7 +4,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' + classpath 'com.android.tools.build:gradle:3.4.0' } } apply plugin: 'com.android.library' @@ -66,4 +66,4 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:support-annotations:28.0.0' -} \ No newline at end of file +}