Migrate to null safety And Android embedding v2

.metadata

@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: 1aedbb1835bd6eb44550293d57d4d124f19901f0
+  revision: ffb2ecea5223acdd139a5039be2f9c796962833d
   channel: stable
 
 project_type: plugin

CHANGELOG.md

@@ -1,25 +1,3 @@
-## 0.1.0
-
-* Add constants.dart.
-* Fix Android build failed.
-* Complete README.md for 0.1.0
-* Complete doc strings.
-
----
-
-## 0.0.4
-
-* Add functions for String / Hex exchanging. (`utils.dart`)
-
-## 0.0.3
-
-* Remove debug messages from `FlutterSerialPortPlugin.java`
-
-## 0.0.2
-
-* Add `baudrate` parameter in `FlutterSerialPort.createSerialPort`
-
 ## 0.0.1
 
-* Integrate Android-SerialPort-API functions.
-* Implement class `SerialPort` and `Device`.
+* TODO: Describe initial release.

analysis_options.yaml

@@ -0,0 +1,4 @@
+include: package:flutter_lints/flutter.yaml
+
+# Additional information about this file can be found at
+# https://dart.dev/guides/language/analysis-options

android/build.gradle

@@ -4,36 +4,34 @@ version '1.0'
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
-        maven { url "https://jitpack.io" }
+        mavenCentral()
     }
 }
 
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
     defaultConfig {
         minSdkVersion 16
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-    lintOptions {
-        disable 'InvalidPackage'
     }
 }
-
 dependencies {
-    implementation 'com.github.licheedev.Android-SerialPort-API:serialport:1.0.1'
 }

android/gradle.properties

@@ -1,2 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
-
+android.useAndroidX=true
+android.enableJetifier=true

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

android/src/main/AndroidManifest.xml

@@ -1,4 +1,3 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
   package="com.example.flutter_serial_port">
 </manifest>

android/src/main/java/android_serialport_api/SerialPort.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2009 Cedric Priscal
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License. 
+ */
+
+package android.serialport;
+
+import android.util.Log;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public class SerialPort {
+
+    private static final String TAG = "SerialPort";
+
+    private static final String DEFAULT_SU_PATH = "/system/bin/su";
+
+    private static String sSuPath = DEFAULT_SU_PATH;
+
+    /**
+     * Set the su binary path, the default su binary path is {@link #DEFAULT_SU_PATH}
+     *
+     * @param suPath su binary path
+     */
+    public static void setSuPath(String suPath) {
+        if (suPath == null) {
+            return;
+        }
+        sSuPath = suPath;
+    }
+
+    /*
+         * Do not remove or rename the field mFd: it is used by native method close();
+         */
+    private FileDescriptor mFd;
+    private FileInputStream mFileInputStream;
+    private FileOutputStream mFileOutputStream;
+
+    public SerialPort(File device, int baudrate, int flags) throws SecurityException, IOException {
+
+		/* Check access permission */
+        if (!device.canRead() || !device.canWrite()) {
+            try {
+                /* Missing read/write permission, trying to chmod the file */
+                Process su;
+                su = Runtime.getRuntime().exec(sSuPath);
+                String cmd = "chmod 666 " + device.getAbsolutePath() + "\n" + "exit\n";
+                su.getOutputStream().write(cmd.getBytes());
+                if ((su.waitFor() != 0) || !device.canRead() || !device.canWrite()) {
+                    throw new SecurityException();
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                throw new SecurityException();
+            }
+        }
+
+        mFd = open(device.getAbsolutePath(), baudrate, flags);
+        if (mFd == null) {
+            Log.e(TAG, "native open returns null");
+            throw new IOException();
+        }
+        mFileInputStream = new FileInputStream(mFd);
+        mFileOutputStream = new FileOutputStream(mFd);
+    }
+
+    public SerialPort(String devicePath, int baudrate, int flags)
+        throws SecurityException, IOException {
+        this(new File(devicePath), baudrate, flags);
+    }
+
+    public SerialPort(File device, int baudrate) throws SecurityException, IOException {
+        this(device, baudrate, 0);
+    }
+
+    public SerialPort(String devicePath, int baudrate) throws SecurityException, IOException {
+        this(new File(devicePath), baudrate, 0);
+    }
+
+    // Getters and setters
+    public InputStream getInputStream() {
+        return mFileInputStream;
+    }
+
+    public OutputStream getOutputStream() {
+        return mFileOutputStream;
+    }
+
+    // JNI
+    private native static FileDescriptor open(String path, int baudrate, int flags);
+
+    public native void close();
+
+    static {
+        System.loadLibrary("serial_port");
+    }
+}