Added ProxyPacketBondingDelay prefs to option

choiman1559 · choiman1559 · commit c39d15c025ae · 2024-10-09T17:40:33.000+09:00
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/app/src/main/java/com/noti/main/receiver/media/MediaPlayer.java b/app/src/main/java/com/noti/main/receiver/media/MediaPlayer.java
@@ -233,7 +233,7 @@ void sendCommand(JSONObject object) {
                 e.printStackTrace();
             }
 
-            NotiListenerService.sendNotification(notificationBody, context.getPackageName(), context);
+            NotiListenerService.sendNotification(notificationBody, context.getPackageName(), context, true);
         }
     }
 }
diff --git a/app/src/main/java/com/noti/main/service/NotiListenerService.java b/app/src/main/java/com/noti/main/service/NotiListenerService.java
@@ -695,7 +695,7 @@ private synchronized int findIndex(String value) {
     }
 
     public static void sendNotification(JSONObject notification, String PackageName, Context context,
-                                        boolean useFCMOnly, boolean notUseBonding /* TODO: Add false to Real-Time needed requests (eg. Pair Request) */) {
+                                        boolean useFCMOnly, boolean notUseBonding) {
         SharedPreferences prefs = getPrefs();
         PowerUtils manager = getInstance().manager;
 
diff --git a/app/src/main/java/com/noti/main/service/backend/PacketBonding.java b/app/src/main/java/com/noti/main/service/backend/PacketBonding.java
@@ -1,6 +1,7 @@
 package com.noti.main.service.backend;
 
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.util.Log;
 
 import com.noti.main.BuildConfig;
@@ -23,7 +24,7 @@
 
 public class PacketBonding {
 
-    protected static final long DELAY = 300; // TODO: Control delay in user interface?
+    public static final long DEFAULT_DELAY = 300;
     protected static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
     protected static final CopyOnWriteArrayList<JSONObject> onWriteArrayList = new CopyOnWriteArrayList<>();
     protected static volatile ScheduledFuture<?> scheduledFuture;
@@ -36,11 +37,19 @@ public interface OnPacketSingleBondingCallback {
         void onBond(JSONObject notification) throws JSONException, NoSuchAlgorithmException;
     }
 
-    public static void runBondingSchedule(Context context, JSONObject notification, OnPacketSingleBondingCallback onPacketSingleBondingCallback) {
+    public static void runBondingSchedule(Context context, JSONObject notification, OnPacketSingleBondingCallback onPacketSingleBondingCallback) throws Exception {
         if(scheduledFuture != null && !scheduledFuture.isDone()) {
             scheduledFuture.cancel(true);
         }
 
+        SharedPreferences prefs = NotiListenerService.getPrefs();
+        final long selectedDelay = prefs.getLong("ProxyPacketBondingDelay", DEFAULT_DELAY);
+
+        if(selectedDelay <= 0) {
+            onPacketSingleBondingCallback.onBond(notification);
+            return;
+        }
+
         onWriteArrayList.add(notification);
         scheduledFuture = scheduler.schedule(() -> {
             try {
@@ -66,7 +75,7 @@ public static void runBondingSchedule(Context context, JSONObject notification,
             } finally {
                 onWriteArrayList.clear();
             }
-        }, DELAY, TimeUnit.MILLISECONDS);
+        }, selectedDelay, TimeUnit.MILLISECONDS);
     }
 
     @SuppressWarnings("unchecked")
diff --git a/app/src/main/java/com/noti/main/ui/options/OtherPreference.java b/app/src/main/java/com/noti/main/ui/options/OtherPreference.java
@@ -34,6 +34,7 @@
 import com.kieronquinn.monetcompat.core.MonetCompat;
 import com.noti.main.Application;
 import com.noti.main.R;
+import com.noti.main.service.backend.PacketBonding;
 import com.noti.main.service.mirnoti.NotificationActionProcess;
 import com.noti.main.ui.prefs.ServerPingActivity;
 import com.noti.main.ui.prefs.custom.CustomFragment;
@@ -71,6 +72,7 @@ public class OtherPreference extends PreferenceFragmentCompat {
 
     Preference UseBackendProxy;
     Preference EnforceBackendProxy;
+    Preference ProxyPacketBondingDelay;
     Preference UseSplitData;
     Preference SplitInterval;
     Preference SplitAfterEncryption;
@@ -122,6 +124,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
 
         UseBackendProxy = findPreference("UseBackendProxy");
         EnforceBackendProxy = findPreference("EnforceBackendProxy");
+        ProxyPacketBondingDelay = findPreference("ProxyPacketBondingDelay");
         UseSplitData = findPreference("UseSplitData");
         SplitInterval = findPreference("SplitInterval");
         SplitAfterEncryption = findPreference("SplitAfterEncryption");
@@ -172,9 +175,13 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         });
 
         boolean useProxy = prefs.getBoolean("UseBackendProxy", true);
+        long packetBondingDelay = prefs.getLong("ProxyPacketBondingDelay", PacketBonding.DEFAULT_DELAY);
         EnforceBackendProxy.setVisible(useProxy);
+        ProxyPacketBondingDelay.setVisible(useProxy);
+        ProxyPacketBondingDelay.setSummary("Now : " + (packetBondingDelay == 300 ? "300 ms (Default)" : (packetBondingDelay < 1 ? "0 ms (Disabled)" : packetBondingDelay + " ms")));
         UseBackendProxy.setOnPreferenceChangeListener((preference, newValue) -> {
             EnforceBackendProxy.setVisible((boolean) newValue);
+            ProxyPacketBondingDelay.setVisible((boolean) newValue);
             if((boolean)(newValue)) {
                 prefs.edit().putBoolean("UseBackendProxy", false).apply();
                 ((SwitchedPreference)UseSplitData).setChecked(false);
@@ -194,6 +201,7 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 ((SwitchedPreference)UseBackendProxy).setChecked(false);
                 prefs.edit().putBoolean("UseBackendProxy", false).apply();
                 EnforceBackendProxy.setVisible(false);
+                ProxyPacketBondingDelay.setVisible(false);
             }
 
             SplitInterval.setVisible((boolean) newValue);
@@ -462,6 +470,58 @@ public boolean onPreferenceTreeClick(Preference preference) {
                 startActivity(new Intent(mContext, ServerPingActivity.class));
                 break;
 
+            case "ProxyPacketBondingDelay":
+                dialog = new MaterialAlertDialogBuilder(new ContextThemeWrapper(mContext, R.style.Theme_App_Palette_Dialog));
+                dialog.setIcon(R.drawable.ic_fluent_edit_24_regular);
+                dialog.setCancelable(false);
+                dialog.setTitle("Bonding Threshold");
+                dialog.setMessage("""
+                        Packet Bonding is a method of bundling multiple packets into one and transmitting them at once through a proxy server when multiple transmissions are requested consecutively within a short period of time.
+                        
+                        At this time, Threshold is the time to wait for the next packet. If this value is high, it is energy efficient because a large number of requests can be processed with a single network operation, but the network delay time increases accordingly.
+                        
+                        Some real-time aware packets (e.g., pairing requests) may be excluded from these feature and processed.
+                        
+                        The interval maximum limit is 2147483647 ms and Input 0 or lower to disable this option.
+                        """);
+
+                editText = new EditText(mContext);
+                editText.setInputType(InputType.TYPE_CLASS_NUMBER);
+                editText.setHint("Input interval value");
+                editText.setGravity(Gravity.CENTER);
+                editText.setText(String.valueOf(prefs.getLong("ProxyPacketBondingDelay", PacketBonding.DEFAULT_DELAY)));
+
+                parentLayout = new LinearLayout(mContext);
+                layoutParams = new LinearLayout.LayoutParams(
+                        LinearLayout.LayoutParams.MATCH_PARENT,
+                        LinearLayout.LayoutParams.WRAP_CONTENT);
+                layoutParams.setMargins(30, 16, 30, 16);
+                editText.setLayoutParams(layoutParams);
+                parentLayout.addView(editText);
+                dialog.setView(parentLayout);
+
+                dialog.setPositiveButton("Apply", (d, w) -> {
+                    String value = editText.getText().toString();
+                    if (value.isEmpty()) {
+                        ToastHelper.show(mContext, "Please Input Value", "DISMISS",ToastHelper.LENGTH_SHORT);
+                    } else {
+                        int IntValue = Integer.parseInt(value);
+                        if (IntValue > 0x7FFFFFFF - 1) {
+                            ToastHelper.show(mContext, "Value must be lower than 2147483647", "DISMISS",ToastHelper.LENGTH_SHORT);
+                        } else {
+                            prefs.edit().putLong("ProxyPacketBondingDelay", IntValue).apply();
+                            ProxyPacketBondingDelay.setSummary("Now : " + (IntValue == 300 ? "300 ms (Default)" : (IntValue < 1 ? "0 ms (Disabled)" : IntValue + " ms")));
+                        }
+                    }
+                });
+                dialog.setNeutralButton("Reset Default", (d, w) -> {
+                    prefs.edit().putLong("ProxyPacketBondingDelay", PacketBonding.DEFAULT_DELAY).apply();
+                    ProxyPacketBondingDelay.setSummary("Now : 300 ms (Default)");
+                });
+                dialog.setNegativeButton("Cancel", (d, w) -> {});
+                dialog.show();
+                break;
+
             case "SplitInterval":
                 dialog = new MaterialAlertDialogBuilder(new ContextThemeWrapper(mContext, R.style.Theme_App_Palette_Dialog));
                 dialog.setIcon(R.drawable.ic_fluent_edit_24_regular);
diff --git a/app/src/main/res/xml/other_preferences.xml b/app/src/main/res/xml/other_preferences.xml
@@ -51,6 +51,10 @@
             android:key="EnforceBackendProxy"
             android:summary="Always using a proxy server regardless of packet size"
             android:title="Enforce Proxy" />
+        <Preference
+            android:key="ProxyPacketBondingDelay"
+            android:summary="Now : 300 ms (Default)"
+            android:title="Packet Bonding Threshold" />
         <com.noti.main.utils.ui.SwitchedPreference
             android:defaultValue="false"
             android:icon="@drawable/ic_fluent_split_vertical_24_regular"

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ void sendCommand(JSONObject object) {`
`233`	`233`	`e.printStackTrace();`
`234`	`234`	`}`
`235`	`235`
`236`		`- NotiListenerService.sendNotification(notificationBody, context.getPackageName(), context);`
	`236`	`+ NotiListenerService.sendNotification(notificationBody, context.getPackageName(), context, true);`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -695,7 +695,7 @@ private synchronized int findIndex(String value) {`
`695`	`695`	`}`
`696`	`696`
`697`	`697`	`public static void sendNotification(JSONObject notification, String PackageName, Context context,`
`698`		`- boolean useFCMOnly, boolean notUseBonding /* TODO: Add false to Real-Time needed requests (eg. Pair Request) */) {`
	`698`	`+ boolean useFCMOnly, boolean notUseBonding) {`
`699`	`699`	`SharedPreferences prefs = getPrefs();`
`700`	`700`	`PowerUtils manager = getInstance().manager;`
`701`	`701`