Updated to version 0.3.0

No major changes, just using LiquidCore 0.3.0
Cleaned up some lint warnings

Author: ericwlange

.idea/misc.xml

@@ -3,7 +3,7 @@ A Node.js console UI for LiquidCore
 
 Version
 -------
-[0.2.2](https://github.com/LiquidPlayer/ConsoleSurface/releases/tag/0.2.2) - Get it through [JitPack](https://jitpack.io/#LiquidPlayer/ConsoleSurface/0.2.2)
+[0.3.0](https://github.com/LiquidPlayer/ConsoleSurface/releases/tag/0.3.0) - Get it through [JitPack](https://jitpack.io/#LiquidPlayer/ConsoleSurface/0.3.0)
 
 [![Release](https://jitpack.io/v/LiquidPlayer/ConsoleSurface.svg)](https://jitpack.io/#LiquidPlayer/ConsoleSurface)
 
@@ -118,7 +118,7 @@ Then, add the ConsoleSurface library to your **app's `build.gradle`**:
 ```
 dependencies {
     ...
-	  compile 'com.github.LiquidPlayer:ConsoleSurface:0.2.2'
+	  compile 'com.github.LiquidPlayer:ConsoleSurface:0.3.0'
 }
 
 ```
@@ -182,7 +182,7 @@ LiquidCore_ {
   _events: {},
   _eventsCount: 0,
   _maxListeners: undefined,
-  availableSurfaces: { 'org.liquidplayer.surface.console.ConsoleSurface': '0.2.2' },
+  availableSurfaces: { 'org.liquidplayer.surface.console.ConsoleSurface': '0.3.0' },
   attach: [Function: attach_],
   detach: [Function: detach_] }
 ```
@@ -194,7 +194,7 @@ Type `LiquidCore.detach()` in your console and Poof! Your surface is gone.  If y
 device, a new instance will be launched and reattached.  Type `process.exit()`
 and the same thing happens.
 
-Of course it is possible to use a [`LiquidView`](https://liquidplayer.github.io/LiquidCoreAndroid/0.2.2/org/liquidplayer/service/LiquidView.html) programmatically and dynamically set its available surfaces
+Of course it is possible to use a [`LiquidView`](https://liquidplayer.github.io/LiquidCoreAndroid/0.3.0/org/liquidplayer/service/LiquidView.html) programmatically and dynamically set its available surfaces
 and URI.  The [ExampleBitTorrentμService](https://github.com/LiquidPlayer/Examples/tree/master/ExampleBitTorrent%CE%BCService) project uses LiquidView programmatically.
 
 License

README.md

@@ -3,9 +3,13 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -17,6 +21,10 @@ allprojects {
     repositories {
         jcenter()
         maven { url "https://jitpack.io" }
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 

build.gradle

@@ -1,6 +1,6 @@
-#Mon Dec 28 10:00:20 PST 2015
+#Sat Nov 18 17:32:51 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -3,14 +3,14 @@ apply plugin: 'jacoco'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    compileSdkVersion 26
+    buildToolsVersion "26.0.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 26
         versionCode 2
-        versionName "0.2.2"
+        versionName "0.3.0"
         setProperty("archivesBaseName", "LiquidConsoleSurface")
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
@@ -28,13 +28,13 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    testCompile 'junit:junit:4.12'
-    compile 'com.github.LiquidPlayer:LiquidCore:0.2.2'
+    implementation 'com.android.support:appcompat-v7:26.1.0'
+    testImplementation 'junit:junit:4.12'
+    implementation 'com.github.LiquidPlayer:LiquidCore:0.3.0'
 }
 
 // build a jar with source files
@@ -61,7 +61,6 @@ artifacts {
     archives javadocJar
 }
 
-
 apply plugin: 'com.github.dcendents.android-maven'
 
 group='com.github.liquidplayer'

lib/build.gradle

@@ -38,14 +38,14 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import android.text.Html;
 import android.text.TextUtils;
 import android.util.AttributeSet;
-import android.widget.TextView;
+import android.support.v7.widget.AppCompatTextView;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.concurrent.Semaphore;
 
-class AnsiConsoleTextView extends TextView {
+class AnsiConsoleTextView extends AppCompatTextView {
     public AnsiConsoleTextView(Context context, AttributeSet attrs) {
         super(context, attrs);
         stream = new ConsoleOutputStream(new ByteArrayOutputStream());

lib/src/main/java/org/liquidplayer/surface/console/AnsiConsoleTextView.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2009, Progress Software Corporation and/or its 
  * subsidiaries or affiliates.  All rights reserved.
  *
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
+/*
  * Edited by Eric Lange for LiquidPlayer
  * Copyright (C) 2016, Eric Lange.  All Rights Reserved.
  */
@@ -53,7 +53,7 @@ class AnsiOutputStream extends FilterOutputStream {
     private byte[] buffer = new byte[MAX_ESCAPE_SEQUENCE_LENGTH];
     private int pos = 0;
     private int startOfValue;
-    private final ArrayList<Object> options = new ArrayList<Object>();
+    private final ArrayList<Object> options = new ArrayList<>();
 
     private static final int LOOKING_FOR_FIRST_ESC_CHAR = 0;
     private static final int LOOKING_FOR_SECOND_ESC_CHAR = 1;
@@ -108,9 +108,9 @@ public void write(int data) throws IOException {
                 } else if (';' == data) {
                     options.add(null);
                 } else if ('?' == data) {
-                    options.add(new Character('?'));
+                    options.add('?');
                 } else if ('=' == data) {
-                    options.add(new Character('='));
+                    options.add('=');
                 } else {
                     reset(processEscapeCommand(options, data));
                 }
@@ -122,7 +122,7 @@ public void write(int data) throws IOException {
                 buffer[pos++] = (byte) data;
                 if (!('0' <= data && data <= '9')) {
                     String strValue = new String(buffer, startOfValue, (pos - 1) - startOfValue, "UTF-8");
-                    Integer value = new Integer(strValue);
+                    Integer value = Integer.valueOf(strValue);
                     options.add(value);
                     if (data == ';') {
                         state = LOOKING_FOR_NEXT_ARG;
@@ -159,13 +159,11 @@ public void write(int data) throws IOException {
                 buffer[pos++] = (byte) data;
                 if (';' == data) {
                     String strValue = new String(buffer, startOfValue, (pos - 1) - startOfValue, "UTF-8");
-                    Integer value = new Integer(strValue);
+                    Integer value = Integer.valueOf(strValue);
                     options.add(value);
                     startOfValue = pos;
                     state = LOOKING_FOR_OSC_PARAM;
-                } else if ('0' <= data && data <= '9') {
-                    // already pushed digit to buffer, just keep looking
-                } else {
+                } else if (!('0' <= data && data <= '9')) {
                     // oops, did not expect this
                     reset(false);
                 }
@@ -179,9 +177,9 @@ public void write(int data) throws IOException {
                     reset(processOperatingSystemCommand(options));
                 } else if (FIRST_ESC_CHAR == data) {
                     state = LOOKING_FOR_ST;
-                } else {
+                } /*else {
                     // just keep looking while adding text
-                }
+                }*/
                 break;
 
             case LOOKING_FOR_ST:
@@ -205,9 +203,8 @@ public void write(int data) throws IOException {
     /**
      * Resets all state to continue with regular parsing
      * @param skipBuffer if current buffer should be skipped or written to out
-     * @throws IOException
      */
-    private void reset(boolean skipBuffer) throws IOException {
+    private void reset(boolean skipBuffer) /*throws IOException*/ {
         /*
         FIXME!
         if (!skipBuffer) {
@@ -273,7 +270,7 @@ private boolean processEscapeCommand(ArrayList<Object> options, int command) thr
                     for (Object next : options) {
                         if (next != null) {
                             count++;
-                            int value = ((Integer) next).intValue();
+                            int value = ((Integer) next);
                             if (30 <= value && value <= 37) {
                                 processSetForegroundColor(value - 30);
                             } else if (40 <= value && value <= 47) {
@@ -486,7 +483,7 @@ private int optionInt(ArrayList<Object> options, int index) {
             throw new IllegalArgumentException();
         if (!value.getClass().equals(Integer.class))
             throw new IllegalArgumentException();
-        return ((Integer) value).intValue();
+        return ((Integer) value);
     }
 
     private int optionInt(ArrayList<Object> options, int index, int defaultValue) {
@@ -495,7 +492,7 @@ private int optionInt(ArrayList<Object> options, int index, int defaultValue) {
             if (value == null) {
                 return defaultValue;
             }
-            return ((Integer) value).intValue();
+            return ((Integer) value);
         }
         return defaultValue;
     }

lib/src/main/java/org/liquidplayer/surface/console/AnsiOutputStream.java

@@ -38,6 +38,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.AttributeSet;
+import android.view.View;
 
 import org.liquidplayer.javascript.JSContext;
 import org.liquidplayer.javascript.JSException;
@@ -47,6 +48,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 import org.liquidplayer.node.Process;
 import org.liquidplayer.service.MicroService;
 import org.liquidplayer.service.Surface;
+import org.liquidplayer.service.Synchronizer;
 
 import java.util.HashMap;
 
@@ -92,6 +94,11 @@ protected void resize(int columns, int rows) {
         }
     }
 
+    @Override
+    public void bind(MicroService service, JSContext context, Synchronizer synchronizer) {
+        // Nothing to do -- everything happens during attach
+    }
+
     /**
      * ConsoleSurface is somewhat unusal for Surfaces.  It can be attached and detached at any
      * time during the MicroService lifecycle, as it dynamically overrides stderr, stdout and
@@ -101,10 +108,11 @@ protected void resize(int columns, int rows) {
      * @param service  The MicroService to attach
      */
     @Override
-    public void attach(MicroService service, Runnable onAttached) {
+    public View attach(MicroService service, Runnable onAttached) {
         session = ConsoleSession.newSession(service, onAttached);
         session.setCurrentView(this);
         uuid = service.getId();
+        return this;
     }
 
     @Override

lib/src/main/java/org/liquidplayer/surface/console/ConsoleSurface.java

@@ -185,17 +185,17 @@ public void run() {
     private Handler uiThread = new Handler(Looper.getMainLooper());
 
     private void loadViews() {
-        inputBox = (EditText) findViewById(R.id.inputBox);
-        scrollView = (NestedScrollView) findViewById(R.id.scroll);
+        inputBox = findViewById(R.id.inputBox);
+        scrollView = findViewById(R.id.scroll);
 
         inputBox.setFocusableInTouchMode(true);
         inputBox.requestFocus();
         inputBox.setOnEditorActionListener(onEditorAction);
         inputBox.setOnKeyListener(onKeyListener);
         inputBox.setEnabled(false);
 
-        upHistory = (ImageButton) findViewById(R.id.up_history);
-        downHistory = (ImageButton) findViewById(R.id.down_history);
+        upHistory = findViewById(R.id.up_history);
+        downHistory = findViewById(R.id.down_history);
 
         upHistory.setOnClickListener(onUpClick);
         downHistory.setOnClickListener(onDownClick);
@@ -205,7 +205,7 @@ private void loadViews() {
         ViewTreeObserver vto = scrollView.getViewTreeObserver();
         vto.addOnGlobalLayoutListener(onLayout);
 
-        consoleTextView = (AnsiConsoleTextView) findViewById(R.id.console_text);
+        consoleTextView = findViewById(R.id.console_text);
         consoleTextView.addListener(this);
         // FIXME: Don't forget to removeListener on shutdown
 

lib/src/main/java/org/liquidplayer/surface/console/ConsoleView.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (C) 2009, Progress Software Corporation and/or its 
  * subsidiaries or affiliates.  All rights reserved.
  *
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/**
+/*
  * Edited by Eric Lange for LiquidPlayer
  * Copyright (C) 2016, Eric Lange.  All Rights Reserved.
  */