Merge pull request #9 from zerobranch/develop

Develop

Author: zerobranch

.gitignore

@@ -4,7 +4,6 @@
 .DS_Store
 /build
 /debugger/build
-/example
 /captures
 .externalNativeBuild
 local.properties

CHANGELOG.md

@@ -1,12 +1,19 @@
 # Change Log
 
-## Version 1.1.0 *(2021-03-01)*
+## Version 1.1.2 *(17-03-2022)*
+* Updated gradle version
+* Updated dependencies
+* Specified flags for PendingIntent
+* Increased minSdkVersion to 21
+
+
+## Version 1.1.0 *(01-03-2021)*
 Added no-op version.
 
 
-## Version 1.0.1 *(2020-11-08)*
+## Version 1.0.1 *(08-11-2020)*
 Made resources private.
 
 
-## Version 1.0.0 *(2020-01-06)*
+## Version 1.0.0 *(06-01-2020)*
 Initial release

README.md

@@ -1,6 +1,7 @@
 # Android Remote Debugger
 [![](https://jitpack.io/v/zerobranch/android-remote-debugger.svg)](https://jitpack.io/#zerobranch/android-remote-debugger) 
-[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/zerobranch/android-remote-debugger/blob/master/LICENSE)
+[![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=21)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/zerobranch/android-remote-debugger/blob/master/LICENSE)
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Android%20Remote%20Debugger-green.svg?style=flat)](https://android-arsenal.com/details/1/8040)
 
 **Android Remote Debugger** is a library for remote debugging Android applications. It allows you to view logs, databases, shared preferences and network requests directly in the browser.
@@ -47,8 +48,8 @@ allprojects {
 Add the following dependency to your module's build.gradle:
 ```groovy
 dependencies {
-    debugImplementation 'com.github.zerobranch.android-remote-debugger:debugger:1.1.0'
-    releaseImplementation 'com.github.zerobranch.android-remote-debugger:noop:1.1.0'
+    debugImplementation 'com.github.zerobranch.android-remote-debugger:debugger:1.1.2'
+    releaseImplementation 'com.github.zerobranch.android-remote-debugger:noop:1.1.2'
 }
 ```
 **Note:** The final line above will use a no-op version, which does nothing.

RUSSIAN_README.md

@@ -1,6 +1,7 @@
 # Android Remote Debugger
 [![](https://jitpack.io/v/zerobranch/android-remote-debugger.svg)](https://jitpack.io/#zerobranch/android-remote-debugger) 
-[![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=19) [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/zerobranch/android-remote-debugger/blob/master/LICENSE)
+[![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=21)
+[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/zerobranch/android-remote-debugger/blob/master/LICENSE)
 [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Android%20Remote%20Debugger-green.svg?style=flat)](https://android-arsenal.com/details/1/8040)
 
 **Android Remote Debugger** - это библиотека для удаленной отладки Android приложений. Она позволяет просматривать логи, базы данных, shared preferences и сетевые запросы прямо в браузере.
@@ -47,8 +48,8 @@ allprojects {
 Добавьте в build.gradle вашего модуля следующую зависимость:
 ```groovy
 dependencies {
-    debugImplementation 'com.github.zerobranch.android-remote-debugger:debugger:1.1.0'
-    releaseImplementation 'com.github.zerobranch.android-remote-debugger:noop:1.1.0'
+    debugImplementation 'com.github.zerobranch.android-remote-debugger:debugger:1.1.2'
+    releaseImplementation 'com.github.zerobranch.android-remote-debugger:noop:1.1.2'
 }
 ```
 **Примечание:** В последней строке выше будет использоваться no-op версия, которая ничего не делает. Её следует использовать только в релизных сборках. Это делает невозможным запуск сервера в релизной сборке.

build.gradle

@@ -1,14 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-        
+        classpath 'com.android.tools.build:gradle:7.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -18,7 +17,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

debugger/build.gradle

@@ -3,13 +3,11 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 31
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 29
-        versionCode 1
-        versionName '1.0'
+        minSdkVersion 21
+        targetSdkVersion 31
         consumerProguardFiles 'proguard-rules.pro'
     }
 
@@ -19,11 +17,16 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
-    implementation 'com.google.code.gson:gson:2.8.5'
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'com.google.code.gson:gson:2.8.8'
+    implementation 'androidx.core:core:1.7.0'
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
 }

debugger/src/main/java/zerobranch/androidremotedebugger/AppNotification.java

@@ -114,21 +114,24 @@ private void notification(@Nullable String title, @Nullable String description,
                 .setStyle(new NotificationCompat.BigTextStyle().bigText(description))
                 .setAutoCancel(true);
 
+        int pendingIntentFlag = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_IMMUTABLE : 0;
+
         if (isError) {
             Intent repeatConnectionIntent = new Intent(context, NotificationReceiver.class);
             repeatConnectionIntent.setAction(NotificationReceiver.ACTION_REPEAT_CONNECTION);
-            PendingIntent repeatConnectionPendingIntent = PendingIntent.getBroadcast(context, 0, repeatConnectionIntent, 0);
+            PendingIntent repeatConnectionPendingIntent = PendingIntent.getBroadcast(context, 0, repeatConnectionIntent, pendingIntentFlag);
 
             Intent changePortIntent = new Intent(context, NotificationReceiver.class);
             changePortIntent.setAction(NotificationReceiver.ACTION_CHANGE_PORT);
-            PendingIntent changePortPendingIntent = PendingIntent.getBroadcast(context, 0, changePortIntent, 0);
+            PendingIntent changePortPendingIntent = PendingIntent.getBroadcast(context, 0, changePortIntent, pendingIntentFlag);
 
             builder.addAction(0, "Repeat", repeatConnectionPendingIntent);
             builder.addAction(0, "Change port", changePortPendingIntent);
         } else {
             Intent disconnectIntent = new Intent(context, NotificationReceiver.class);
             disconnectIntent.setAction(NotificationReceiver.ACTION_DISCONNECT);
-            PendingIntent disconnectPendingIntent = PendingIntent.getBroadcast(context, 0, disconnectIntent, 0);
+
+            PendingIntent disconnectPendingIntent = PendingIntent.getBroadcast(context, 0, disconnectIntent, pendingIntentFlag);
             builder.addAction(0, "Disconnect", disconnectPendingIntent);
         }
 

debugger/src/main/java/zerobranch/androidremotedebugger/api/base/Controller.java

@@ -22,15 +22,15 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
-import zerobranch.androidremotedebugger.settings.InternalSettings;
-import zerobranch.androidremotedebugger.utils.InternalUtils;
 
 import java.lang.reflect.Type;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 
 import fi.iki.elonen.NanoHTTPD;
+import zerobranch.androidremotedebugger.settings.InternalSettings;
+import zerobranch.androidremotedebugger.utils.InternalUtils;
 
 public abstract class Controller {
     protected static final String EMPTY = "";
@@ -105,11 +105,11 @@ protected <T> List<T> deserialize(String json, Type type) {
 
     protected void throwEmptyParameterException(String parameter) throws NanoHTTPD.ResponseException {
         throw new NanoHTTPD.ResponseException(NanoHTTPD.Response.Status.BAD_REQUEST,
-                "'" + parameter + "' parameter not found");
+            "'" + parameter + "' parameter not found");
     }
 
     protected String prettyJson(String item) throws JsonSyntaxException {
-        return prettyPrintJson.toJson(new JsonParser().parse(item));
+        return prettyPrintJson.toJson(JsonParser.parseString(item));
     }
 
     protected String fromBase64(String value) {

debugger/src/main/java/zerobranch/androidremotedebugger/api/database/DatabaseController.java

@@ -17,6 +17,12 @@
 
 import android.content.Context;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import fi.iki.elonen.NanoHTTPD;
+import fi.iki.elonen.NanoHTTPD.ResponseException;
 import zerobranch.androidremotedebugger.api.base.Controller;
 import zerobranch.androidremotedebugger.api.base.HtmlParams;
 import zerobranch.androidremotedebugger.http.Host;
@@ -28,14 +34,6 @@
 import zerobranch.androidremotedebugger.source.models.UpdatingDatabase;
 import zerobranch.androidremotedebugger.utils.FileUtils;
 
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-
-import fi.iki.elonen.NanoHTTPD;
-import fi.iki.elonen.NanoHTTPD.ResponseException;
-
 public class DatabaseController extends Controller {
     private static final int FIRST_PAGE = 1;
     private static final int LAST_PAGE = -1;
@@ -101,12 +99,7 @@ private String getTables(Map<String, List<String>> params) throws ResponseExcept
         DatabaseManager.connect(context, dbName);
 
         List<String> tables = getDBAccess().getTables();
-        Collections.sort(tables, new Comparator<String>() {
-            @Override
-            public int compare(String o1, String o2) {
-                return o1.compareToIgnoreCase(o2);
-            }
-        });
+        Collections.sort(tables, String::compareToIgnoreCase);
 
         return serialize(new Tables(tables, getDBAccess().getDatabaseVersion()));
     }
@@ -122,8 +115,8 @@ private String updateTable(Map<String, List<String>> params) throws ResponseExce
 
         final String tableName = getStringValue(params, HtmlParams.NAME);
         final UpdatingDatabase fields = deserialize(
-                getStringValue(params, HtmlParams.DATA),
-                UpdatingDatabase.class
+            getStringValue(params, HtmlParams.DATA),
+            UpdatingDatabase.class
         );
 
         for (int i = 0; i < fields.newValues.size(); i++) {
@@ -146,8 +139,8 @@ private String deleteTableItems(Map<String, List<String>> params) throws Respons
 
         final String tableName = getStringValue(params, HtmlParams.NAME);
         final DeletingDatabase deletingDatabase = deserialize(
-                getStringValue(params, HtmlParams.DATA),
-                DeletingDatabase.class
+            getStringValue(params, HtmlParams.DATA),
+            DeletingDatabase.class
         );
 
         for (int i = 0; i < deletingDatabase.fields.size(); i++) {
@@ -182,12 +175,7 @@ private String dropDatabase(Map<String, List<String>> params) throws ResponseExc
 
     private String getDatabases() {
         List<String> databases = DatabaseManager.getDBNameList(context);
-        Collections.sort(databases, new Comparator<String>() {
-            @Override
-            public int compare(String o1, String o2) {
-                return o1.compareToIgnoreCase(o2);
-            }
-        });
+        Collections.sort(databases, String::compareToIgnoreCase);
         return serialize(databases);
     }
 

debugger/src/main/java/zerobranch/androidremotedebugger/api/sharedprefs/SharedPrefsController.java

@@ -18,25 +18,24 @@
 import android.content.Context;
 
 import com.google.gson.reflect.TypeToken;
-import zerobranch.androidremotedebugger.api.base.Controller;
-import zerobranch.androidremotedebugger.api.base.HtmlParams;
-import zerobranch.androidremotedebugger.http.Host;
-import zerobranch.androidremotedebugger.settings.InternalSettings;
-import zerobranch.androidremotedebugger.source.managers.SharedPrefsManager;
-import zerobranch.androidremotedebugger.source.models.SharedPrefsData;
-import zerobranch.androidremotedebugger.utils.FileUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import fi.iki.elonen.NanoHTTPD.ResponseException;
+import zerobranch.androidremotedebugger.api.base.Controller;
+import zerobranch.androidremotedebugger.api.base.HtmlParams;
+import zerobranch.androidremotedebugger.http.Host;
+import zerobranch.androidremotedebugger.settings.InternalSettings;
+import zerobranch.androidremotedebugger.source.managers.SharedPrefsManager;
+import zerobranch.androidremotedebugger.source.models.SharedPrefsData;
+import zerobranch.androidremotedebugger.utils.FileUtils;
 
 public class SharedPrefsController extends Controller {
     private final static String TYPE_INTEGER = "Integer";
@@ -106,9 +105,9 @@ private String update(Map<String, List<String>> params) throws ResponseException
             manager.put(prefsData.key, prefsData.value);
         } else if (prefsData.type.equalsIgnoreCase(TYPE_SET_STRING)) {
             final String[] splitData = prefsData.value
-                    .replaceAll("\\[", "")
-                    .replaceAll("]", "")
-                    .split(",");
+                .replaceAll("\\[", "")
+                .replaceAll("]", "")
+                .split(",");
             manager.put(prefsData.key, new HashSet<>(Arrays.asList(splitData)));
         }
 
@@ -127,12 +126,7 @@ private String dropSharedPreferences(Map<String, List<String>> params) throws Re
 
     private String getAllSharedPreferencesNames() {
         List<String> sharedPreferences = SharedPrefsManager.getSharedPreferences(context);
-        Collections.sort(sharedPreferences, new Comparator<String>() {
-            @Override
-            public int compare(String o1, String o2) {
-                return o1.compareToIgnoreCase(o2);
-            }
-        });
+        Collections.sort(sharedPreferences, String::compareToIgnoreCase);
         return serialize(sharedPreferences);
     }