settings: add option to change ADB local server port

Signed-off-by: Muntashir Al-Islam <muntashirakon@riseup.net>

Author: MuntashirAkon

app/src/main/java/io/github/muntashirakon/AppManager/servermanager/LocalServer.java

@@ -4,7 +4,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.os.UserHandleHidden;
 
 import androidx.annotation.AnyThread;
 import androidx.annotation.GuardedBy;
@@ -87,7 +86,7 @@ private LocalServer() throws IOException, AdbPairingRequiredException {
         mContext = ContextUtils.getDeContext(ContextUtils.getContext());
         mLocalServerManager = LocalServerManager.getInstance(mContext);
         // Initialise necessary files and permissions
-        ServerConfig.init(mContext, UserHandleHidden.myUserId());
+        ServerConfig.init(mContext);
         // Start server if not already
         checkConnect();
     }

app/src/main/java/io/github/muntashirakon/AppManager/servermanager/ServerConfig.java

@@ -3,7 +3,6 @@
 package io.github.muntashirakon.AppManager.servermanager;
 
 import android.annotation.SuppressLint;
-import android.annotation.UserIdInt;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
@@ -25,6 +24,7 @@
 import io.github.muntashirakon.AppManager.logs.Log;
 import io.github.muntashirakon.AppManager.misc.NoOps;
 import io.github.muntashirakon.AppManager.server.common.Constants;
+import io.github.muntashirakon.AppManager.settings.Prefs;
 import io.github.muntashirakon.AppManager.utils.ContextUtils;
 import io.github.muntashirakon.AppManager.utils.FileUtils;
 
@@ -34,18 +34,16 @@ public final class ServerConfig {
 
     public static final int DEFAULT_ADB_PORT = 5555;
     static final String SERVER_RUNNER_EXEC_NAME = "run_server.sh";
-    private static final int DEFAULT_LOCAL_SERVER_PORT = 60001;
     private static final String LOCAL_TOKEN = "l_token";
     private static final File[] SERVER_RUNNER_EXEC = new File[2];
     private static final File[] SERVER_RUNNER_JAR = new File[2];
     private static final SharedPreferences sPreferences = ContextUtils.getContext()
             .getSharedPreferences("server_config", Context.MODE_PRIVATE);
-    private static int sServerPort = DEFAULT_LOCAL_SERVER_PORT;
     private static volatile boolean sInitialised = false;
 
     @WorkerThread
     @NoOps
-    public static void init(@NonNull Context context, @UserIdInt int userHandle) throws IOException {
+    public static void init(@NonNull Context context) throws IOException {
         if (sInitialised) {
             return;
         }
@@ -69,9 +67,6 @@ public static void init(@NonNull Context context, @UserIdInt int userHandle) thr
         FileUtils.chmod711(deStorage);
         FileUtils.chmod644(SERVER_RUNNER_JAR[1]);
         FileUtils.chmod644(SERVER_RUNNER_EXEC[1]);
-        if (userHandle != 0) {
-            sServerPort += userHandle;
-        }
 
         sInitialised = true;
     }
@@ -133,7 +128,7 @@ public static void setAdbPort(@IntRange(from = 0, to = 65535) int port) {
 
     @AnyThread
     public static int getLocalServerPort() {
-        return sServerPort;
+        return Prefs.Misc.getAdbLocalServerPort();
     }
 
     @WorkerThread

app/src/main/java/io/github/muntashirakon/AppManager/settings/AdvancedPreferences.java

@@ -126,6 +126,27 @@ public void onCreatePreferences(@Nullable Bundle savedInstanceState, @Nullable S
                     .show();
             return true;
         });
+        // ADB local server port
+        Preference adbLsPort = Objects.requireNonNull(findPreference("adb_local_server_port"));
+        int port = Prefs.Misc.getAdbLocalServerPort();
+        adbLsPort.setSummary(String.valueOf(port));
+        adbLsPort.setOnPreferenceClickListener(pref -> {
+            new TextInputDialogBuilder(requireActivity(), null)
+                    .setTitle(R.string.adb_local_server_port)
+                    .setInputText(String.valueOf(port))
+                    .setInputInputType(InputType.TYPE_CLASS_NUMBER)
+                    .setInputImeOptions(EditorInfo.IME_ACTION_DONE | EditorInfoCompat.IME_FLAG_NO_PERSONALIZED_LEARNING)
+                    .setNegativeButton(R.string.cancel, null)
+                    .setPositiveButton(R.string.save, (dialog, which, inputText, isChecked) -> {
+                        if (inputText != null && TextUtils.isDigitsOnly(inputText)) {
+                            int c = Integer.decode(inputText.toString());
+                            Prefs.Misc.setAdbLocalServerPort(c);
+                            adbLsPort.setSummary(String.valueOf(c));
+                        }
+                    })
+                    .show();
+            return true;
+        });
         // Import/export App Manager's KeyStore
         ((Preference) Objects.requireNonNull(findPreference("import_export_keystore")))
                 .setOnPreferenceClickListener(preference -> {

app/src/main/java/io/github/muntashirakon/AppManager/settings/MainPreferencesViewModel.java

@@ -129,7 +129,7 @@ public MutableLiveData<String> getCustomCommand1() {
     public void loadCustomCommands() {
         mExecutor.submit(() -> {
             try {
-                ServerConfig.init(getApplication(), UserHandleHidden.myUserId());
+                ServerConfig.init(getApplication());
                 mCustomCommand0.postValue(ServerConfig.getServerRunnerCommand(0));
                 mCustomCommand1.postValue(ServerConfig.getServerRunnerCommand(1));
             } catch (Throwable e) {

app/src/main/java/io/github/muntashirakon/AppManager/settings/Prefs.java

@@ -573,6 +573,14 @@ public static void setSelectedUsers(@Nullable int[] users) {
         public static boolean sendNotificationsToConnectedDevices() {
             return AppPref.getBoolean(AppPref.PrefKey.PREF_SEND_NOTIFICATIONS_TO_CONNECTED_DEVICES_BOOL);
         }
+
+        public static void setAdbLocalServerPort(int port) {
+            AppPref.set(AppPref.PrefKey.PREF_ADB_LOCAL_SERVER_PORT_INT, port);
+        }
+
+        public static int getAdbLocalServerPort() {
+            return AppPref.getInt(AppPref.PrefKey.PREF_ADB_LOCAL_SERVER_PORT_INT);
+        }
     }
 
     public static final class RunningApps {

app/src/main/java/io/github/muntashirakon/AppManager/utils/AppPref.java

@@ -10,6 +10,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
+import android.os.UserHandleHidden;
 import android.util.Log;
 import android.view.View;
 
@@ -54,6 +55,7 @@ public class AppPref {
      */
     @Keep
     public enum PrefKey {
+        PREF_ADB_LOCAL_SERVER_PORT_INT,
         PREF_APP_OP_SHOW_DEFAULT_BOOL,
         PREF_APP_OP_SORT_ORDER_INT,
         PREF_APP_THEME_INT,
@@ -373,6 +375,8 @@ private void init() {
     @NonNull
     public Object getDefaultValue(@NonNull PrefKey key) {
         switch (key) {
+            case PREF_ADB_LOCAL_SERVER_PORT_INT:
+                return (UserHandleHidden.myUserId() + 60001);
             case PREF_BACKUP_FLAGS_INT:
                 return BackupFlags.BACKUP_INT_DATA | BackupFlags.BACKUP_RULES
                         | BackupFlags.BACKUP_APK_FILES | BackupFlags.BACKUP_EXTRAS;

app/src/main/res/values/strings.xml

@@ -1552,4 +1552,9 @@
     <string name="modify_last_modification_time">Modify last modification time</string>
     <string name="modify_last_access_time">Modify last access time</string>
     <string name="change_id">Change ID</string>
+    <string name="memory_usage_accessibility_description">The system is currently using %s memory out of %s, and the amount of available memory is %s. Among the occupied memory, the applications are using %s, %s are cached, and %s are used as memory buffers.</string>
+    <string name="memory_usage_unavailable">Memory usage is unavailable right now.</string>
+    <string name="swap_usage_accessibility_description">The system has allocated %s for swap and currently using %s.</string>
+    <string name="selected_items_accessibility_description">Selected %d out of %d items</string>
+    <string name="adb_local_server_port">ADB local server port</string>
 </resources>

app/src/main/res/xml/preferences_advanced.xml

@@ -19,6 +19,12 @@
         tools:summary="Execute at most 5 operations in parallel"
         app:iconSpaceReserved="false" />
 
+    <Preference
+        app:key="adb_local_server_port"
+        app:title="@string/adb_local_server_port"
+        tools:summary="60001"
+        app:iconSpaceReserved="false" />
+
     <Preference
         app:key="import_export_keystore"
         app:title="@string/pref_import_export_keystore"

libcore/ui/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <!-- SPDX-License-Identifier: GPL-3.0-or-later -->
 <resources>
     <string name="select_all">Select all</string>
+    <string name="selected_items_accessibility_description">Selected %d out of %d items</string>
 </resources>