Merge branch 'nethunter' into 'master'

Move nethunter branch to master

See merge request kalilinux/nethunter/apps/kali-nethunter-term!15

.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/
+  - .gradle/

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,11 +20,11 @@ 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=2020030100
-    versionName="2020.3"
+    versionCode=2020040100
+    versionName="2020.4"
 }
 

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

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'
-}
+}

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);