Implemented branch v1 changes into v2 to ensure proper merging with m…

…ain after shawi's update.
WSU-4110 · Oct 21, 2024 · a4f6da8 · a4f6da8
1 parent 12ab52c
commit a4f6da8
Show file tree

Hide file tree

Showing 17 changed files with 428 additions and 421 deletions.
diff --git a/DAIRemoteApp/app/src/main/AndroidManifest.xml b/DAIRemoteApp/app/src/main/AndroidManifest.xml
@@ -2,10 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application

diff --git a/DAIRemoteApp/app/src/main/java/com/example/dairemote_app/ConnectionManager.java b/DAIRemoteApp/app/src/main/java/com/example/dairemote_app/ConnectionManager.java
@@ -20,12 +20,11 @@
 
 public class ConnectionManager {
     public static ScheduledExecutorService heartbeatScheduler;
-    private ExecutorService executorService;
+    private final ExecutorService executorService;
     public static DatagramSocket udpSocket;
     public static String serverAddress;
     public static int serverPort;
     public static String serverResponse;
-    public static String heartbeatAck = "";
     public static HostSearchCallback callback;
     public static boolean connectionEstablished = false;
     public static int declineCount = 0;
@@ -138,7 +137,7 @@ public boolean finishConnection() {
 
     public void startHeartbeat() {
         // Create a ScheduledExecutorService to run heartbeat with a delay after each execution
-        heartbeatScheduler = Executors.newScheduledThreadPool(2);
+        heartbeatScheduler = Executors.newScheduledThreadPool(1);
         heartbeatScheduler.scheduleWithFixedDelay(new Runnable() {
             @Override
             public void run() {
@@ -218,7 +217,7 @@ public static void hostSearch() {
             socket.setBroadcast(true);
             String message = "Hello, I'm " + getDeviceName();
             byte[] sendData = message.getBytes();
-            InetAddress broadcastAddress = InetAddress.getByName("192.168.1.255"); // Broadcast address
+            InetAddress broadcastAddress = InetAddress.getByName("255.255.255.255"); // Broadcast address
             int port = 11000;
             DatagramPacket packet = new DatagramPacket(sendData, sendData.length, broadcastAddress, port);
             socket.send(packet);