Update tools, Java8, new APK

iakov · iakov · commit 011b20a7eafe · 2021-02-15T16:02:16.000+03:00
diff --git a/_apk/TRIKGamepad-1.26 v34.apk b/_apk/TRIKGamepad-1.26 v34.apk
diff --git a/as/build.gradle b/as/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
     }
 }
 
@@ -23,14 +23,13 @@ android {
     signingConfigs {
         config {
             keyAlias 'gamepad'
-            storeFile file('~/android-keystorage.jks')
+            storeFile file('../../android-keystorage.jks')
         }
     }
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.trikset.gamepad"
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion 16
         resConfigs "en"
         signingConfig signingConfigs.config
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -55,17 +54,21 @@ android {
             includeAndroidResources = true
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.core:core:1.0.2'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core:1.3.2'
     implementation 'androidx.annotation:annotation:1.1.0'
-    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'commons-io:commons-io:2.6'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.robolectric:robolectric:4.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test:rules:1.3.0-alpha02'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    androidTestImplementation 'androidx.test:rules:1.4.0-alpha04'
 }
diff --git a/as/gradle/wrapper/gradle-wrapper.properties b/as/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Jul 21 11:14:00 MSK 2019
+#Mon Feb 15 15:17:07 MSK 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
diff --git a/as/src/androidTest/java/com/trikset/gamepad/DummyServer.java b/as/src/androidTest/java/com/trikset/gamepad/DummyServer.java
@@ -15,24 +15,21 @@ public class DummyServer {
     private boolean canStopListening = false;
     public void stopListening() { canStopListening = true; }
 
-    private final ArrayList<String> receivedMessages = new ArrayList<String>();
+    private final ArrayList<String> receivedMessages = new ArrayList<>();
     public List<String> getReceivedMessages() { return receivedMessages; }
 
     DummyServer() {
-        Thread serverThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                try (ServerSocket server = new ServerSocket(DEFAULT_PORT)) {
-                    Socket client = server.accept();
+        Thread serverThread = new Thread(() -> {
+            try (ServerSocket server = new ServerSocket(DEFAULT_PORT)) {
+                Socket client = server.accept();
 
-                    BufferedReader clientInput =
-                            new BufferedReader(new InputStreamReader(client.getInputStream()));
-                    do {
-                        receivedMessages.add(clientInput.readLine());
-                    } while (!canStopListening);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+                BufferedReader clientInput =
+                        new BufferedReader(new InputStreamReader(client.getInputStream()));
+                do {
+                    receivedMessages.add(clientInput.readLine());
+                } while (!canStopListening);
+            } catch (IOException e) {
+                e.printStackTrace();
             }
         });
         serverThread.start();
diff --git a/as/src/main/AndroidManifest.xml b/as/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.trikset.gamepad"
-    android:versionCode="33"
-    android:versionName="1.25">
+    android:versionCode="34"
+    android:versionName="1.26">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE"  tools:node="remove" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"  tools:node="remove" />
diff --git a/as/src/main/java/com/trikset/gamepad/MainActivity.java b/as/src/main/java/com/trikset/gamepad/MainActivity.java
@@ -38,7 +38,6 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.Locale;
-import java.util.Objects;
 
 public class MainActivity extends AppCompatActivity implements SensorEventListener {
 
@@ -111,31 +110,17 @@ protected void onCreate(final Bundle savedInstanceState) {
         recreateMagicButtons(5);
 
         {
-            getSenderService().setOnDisconnectedListener(new SenderService.OnEventListener<String>() {
-                @Override
-                public void onEvent(String reason) {
-                    toast("Disconnected." + reason);
-                }
-            });
-            getSenderService().setShowTextCallback(new SenderService.OnEventListener<String>() {
-                @Override
-                public void onEvent(String text) {
-                    toast(text);
-                }
-            });
+            getSenderService().setOnDisconnectedListener(reason -> toast("Disconnected." + reason));
+            getSenderService().setShowTextCallback(text -> toast(text));
         }
 
         {
             final Button btnSettings = findViewById(R.id.btnSettings);
             if (btnSettings != null) {
-                btnSettings.setOnClickListener(new View.OnClickListener() {
-
-                    @Override
-                    public void onClick(final View v) {
-                        ActionBar a = getSupportActionBar();
-                        if (a != null)
-                            setSystemUiVisibility(!a.isShowing());
-                    }
+                btnSettings.setOnClickListener(v -> {
+                    ActionBar a = getSupportActionBar();
+                    if (a != null)
+                        setSystemUiVisibility(!a.isShowing());
                 });
             }
         }
@@ -335,15 +320,12 @@ protected void onResume() {
                 mVideo.removeCallbacks(mRestartCallback);
             }
 
-            mRestartCallback = new Runnable() {
-                @Override
-                public void run() {
-                    new StartReadMjpegAsync(mVideo).execute(mVideoURL);
-                    if (mRestartCallback != null && mVideo != null)
-                        // drop HTTP connection and restart
-                        mVideo.postDelayed(mRestartCallback, 30000);
-                 }
-            };
+            mRestartCallback = () -> {
+                new StartReadMjpegAsync(mVideo).execute(mVideoURL);
+                if (mRestartCallback != null && mVideo != null)
+                    // drop HTTP connection and restart
+                    mVideo.postDelayed(mRestartCallback, 30000);
+             };
 
             mVideo.post(mRestartCallback);
         }
@@ -402,16 +384,13 @@ private void recreateMagicButtons(final int count) {
             btn.setText(name);
             btn.setBackgroundResource(R.drawable.button_shape);
 
-            btn.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(final View arg0) {
-                    SenderService sender = getSenderService();
-                    if (sender != null) {
-                        sender.send("btn " + name + " down"); // TODO: "up" via
-                        // TouchListner
-                        btn.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
-                                HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
-                    }
+            btn.setOnClickListener(arg0 -> {
+                SenderService sender = getSenderService();
+                if (sender != null) {
+                    sender.send("btn " + name + " down"); // TODO: "up" via
+                    // TouchListner
+                    btn.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
+                            HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
                 }
             });
             buttonsView.addView(btn);
@@ -464,12 +443,7 @@ private void setSystemUiVisibility(boolean show) {
     }
 
     private void toast(final String text) {
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                Toast.makeText(MainActivity.this, text, Toast.LENGTH_LONG).show();
-            }
-        });
+        runOnUiThread(() -> Toast.makeText(MainActivity.this, text, Toast.LENGTH_LONG).show());
     }
 
     public SenderService getSenderService() {
diff --git a/as/src/main/java/com/trikset/gamepad/SenderService.java b/as/src/main/java/com/trikset/gamepad/SenderService.java
@@ -229,7 +229,7 @@ private class KeepAliveTimerTask extends TimerTask {
             @Override
             public void run() {
                 if (mOut != null) {
-                    final String command = "keepalive " + Integer.toString(keepaliveTimeout);
+                    final String command = "keepalive " + keepaliveTimeout;
                     Log.d("TCP", String.format("Sending %s message", command));
                     new SendCommandAsyncTask(command).execute();
                 } else {
diff --git a/as/src/main/java/com/trikset/gamepad/SettingsFragment.java b/as/src/main/java/com/trikset/gamepad/SettingsFragment.java
@@ -13,8 +13,6 @@
 import androidx.preference.PreferenceFragmentCompat;
 
 import java.util.Locale;
-import java.util.Objects;
-import java.util.Optional;
 
 import static android.content.Context.CLIPBOARD_SERVICE;
 
@@ -46,34 +44,27 @@ private void initializeAboutSystemField() {
         aboutSystem.setSummary(getString(R.string.tap_to_copy) + ":" + systemInfo);
 
         // Copying system info to the clipboard on click
-        final Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() {
-            @Override
-            public boolean onPreferenceClick(Preference preference) {
-                ClipboardManager clipboard =
-                        (ClipboardManager) myActivity.getSystemService(CLIPBOARD_SERVICE);
-                ClipData clip = ClipData.newPlainText(getString(R.string.about_system), systemInfo);
-                clipboard.setPrimaryClip(clip);
+        final Preference.OnPreferenceClickListener listener = preference -> {
+            ClipboardManager clipboard =
+                    (ClipboardManager) myActivity.getSystemService(CLIPBOARD_SERVICE);
+            ClipData clip = ClipData.newPlainText(getString(R.string.about_system), systemInfo);
+            clipboard.setPrimaryClip(clip);
 
-                final Toast copiedToClipboardToast = Toast.makeText(
-                        myActivity.getApplicationContext(),
-                        getString(R.string.copied_to_clipboard),
-                        Toast.LENGTH_SHORT);
-                copiedToClipboardToast.show();
+            final Toast copiedToClipboardToast = Toast.makeText(
+                    myActivity.getApplicationContext(),
+                    getString(R.string.copied_to_clipboard),
+                    Toast.LENGTH_SHORT);
+            copiedToClipboardToast.show();
 
-                return true;
-            }
+            return true;
         };
         aboutSystem.setOnPreferenceClickListener(listener);
     }
 
     private void initializeDynamicPreferenceSummary() {
-        final Preference.OnPreferenceChangeListener listener = new Preference.OnPreferenceChangeListener() {
-            @Override
-            public boolean onPreferenceChange(@NonNull final Preference preference,
-                                              @NonNull final Object value) {
-                preference.setSummary(value.toString());
-                return true;
-            }
+        final Preference.OnPreferenceChangeListener listener = (preference, value) -> {
+            preference.setSummary(value.toString());
+            return true;
         };
 
         for (final String preferenceKey :
diff --git a/as/src/main/java/com/trikset/gamepad/SquareTouchPadLayout.java b/as/src/main/java/com/trikset/gamepad/SquareTouchPadLayout.java
@@ -64,15 +64,8 @@ private void init() {
         paint.setStyle(Paint.Style.STROKE);
         paint.setAlpha(255);
         setOnTouchListener(new TouchPadListener());
-        setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
-                        HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING);
-
-            }
-        });
+        setOnClickListener(v -> performHapticFeedback(HapticFeedbackConstants.LONG_PRESS,
+                HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING));
         setWillNotDraw(false);
         setHapticFeedbackEnabled(true);
         setBackgroundDrawable(getResources().getDrawable(R.drawable.oxygen_actions_transform_move_icon));
diff --git a/as/src/main/java/com/trikset/gamepad/StartReadMjpegAsync.java b/as/src/main/java/com/trikset/gamepad/StartReadMjpegAsync.java
@@ -11,7 +11,6 @@
 
 import java.io.IOException;
 import java.net.HttpURLConnection;
-import java.net.URI;
 import java.net.URL;
 
 
diff --git a/as/src/main/res/xml/pref_general.xml b/as/src/main/res/xml/pref_general.xml
@@ -26,11 +26,10 @@
     <EditTextPreference
         android:defaultValue="100"
         android:hint="0..255"
-        android:inputType="number"
         android:key="showPads"
-        android:numeric="integer"
+        android:inputType="number"
         android:summary="0 for fully transparent, and 255 is opaque."
-        android:title="Arrows transparancy" />
+        android:title="Arrows transparency" />
 
     <EditTextPreference
         android:defaultValue="7"
diff --git a/as/src/test/java/com/trikset/gamepad/SenderServiceTest.java b/as/src/test/java/com/trikset/gamepad/SenderServiceTest.java
@@ -73,7 +73,7 @@ public void senderServiceShouldReturnCorrectKeepaliveTimeout() {
         assertEquals(1234, client.getKeepaliveTimeout());
     }
 
-    private class DummyServer {
+    private static class DummyServer {
         static final String IP = "localhost";
         static final int DEFAULT_PORT = 12345;
 
@@ -89,21 +89,18 @@ private class DummyServer {
         DummyServer(final int cmdNumber, final int portShift) {
             port = DEFAULT_PORT + portShift;
 
-            Thread serverThread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    try (ServerSocket server = new ServerSocket(port)) {
-                        Socket client = server.accept();
-                        isConnected = true;
-
-                        BufferedReader clientInput =
-                                new BufferedReader(new InputStreamReader(client.getInputStream()));
-                        for (int i = 0; i < cmdNumber; ++i) {
-                            lastCommand = clientInput.readLine();
-                        }
-                    } catch (IOException e) {
-                        e.printStackTrace();
+            Thread serverThread = new Thread(() -> {
+                try (ServerSocket server = new ServerSocket(port)) {
+                    Socket client = server.accept();
+                    isConnected = true;
+
+                    BufferedReader clientInput =
+                            new BufferedReader(new InputStreamReader(client.getInputStream()));
+                    for (int i = 0; i < cmdNumber; ++i) {
+                        lastCommand = clientInput.readLine();
                     }
+                } catch (IOException e) {
+                    e.printStackTrace();
                 }
             });
             serverThread.start();
