Merge pull request #11 from andreknieriem/offline-hotspot

Offline hotspot

Author: andreknieriem

README.md

@@ -48,6 +48,9 @@ adb shell am start -a android.intent.action.VIEW -d "wirelesshelper://stop"
 ```
 
 ## Changelog
+### v.1.0.1
+- Fixing offline mode
+
 ### v.1.0.0 - First ready version for Playstore!
 - Added Deep Links and App Shortcuts for full automation (Samsung Modes & Routines support).
 - Added Arabic translation, thanks to @A5H0

app/build.gradle.kts

@@ -14,8 +14,8 @@ android {
         applicationId = "com.andrerinas.wirelesshelper"
         minSdk = 21
         targetSdk = 36
-        versionCode = 6
-        versionName = "1.0.0"
+        versionCode = 7
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/andrerinas/wirelesshelper/connection/AapProxy.kt

@@ -82,21 +82,14 @@ class AapProxy(private val remoteIp: String, private val remotePort: Int = 5288,
         try {
             while (isRunning) {
                 val read = input.read(buffer)
-                if (read == -1) {
-                    Log.i(TAG, "$name: Input reached EOF. Closing bridge.")
-                    break
-                }
+                if (read == -1) break
                 output.write(buffer, 0, read)
                 output.flush()
             }
         } catch (e: Exception) {
-            Log.d(TAG, "$name: Error during pump: ${e.message}")
+            Log.d(TAG, "$name error: ${e.message}")
         } finally {
-            // If one direction fails, the entire proxy should stop to trigger cleanup
-            if (isRunning) {
-                Log.i(TAG, "$name: Triggering global proxy stop.")
-                stop()
-            }
+            if (isRunning) stop()
         }
     }
 
@@ -106,4 +99,4 @@ class AapProxy(private val remoteIp: String, private val remotePort: Int = 5288,
         serverSocket = null
         scope.cancel()
     }
-}
+}

app/src/main/java/com/andrerinas/wirelesshelper/strategy/BaseStrategy.kt

@@ -1,12 +1,9 @@
 package com.andrerinas.wirelesshelper.strategy
 
-import android.app.Service
 import android.content.Context
 import android.content.Intent
-import android.database.Cursor
 import android.net.ConnectivityManager
 import android.net.Network
-import android.net.Uri
 import android.os.Build
 import android.os.Parcelable
 import android.util.Log
@@ -23,7 +20,6 @@ abstract class BaseStrategy(protected val context: Context, private val scope: C
     }
 
     protected val TAG = "HUREV_WIFI"
-    private val carConnectionUri = Uri.Builder().scheme("content").authority("androidx.car.app.connection").build()
     private var activeProxy: AapProxy? = null
     var stateListener: StateListener? = null
     protected val isLaunching = AtomicBoolean(false)
@@ -40,6 +36,19 @@ abstract class BaseStrategy(protected val context: Context, private val scope: C
         const val ACTION_TRIGGER_INTENT = "com.andrerinas.wirelesshelper.ACTION_TRIGGER_INTENT"
     }
 
+    private fun createFakeNetwork(netId: Int): Network? {
+        val parcel = android.os.Parcel.obtain()
+        return try {
+            parcel.writeInt(netId)
+            parcel.setDataPosition(0)
+            Network.CREATOR.createFromParcel(parcel)
+        } catch (e: Exception) {
+            null
+        } finally {
+            parcel.recycle()
+        }
+    }
+
     protected fun launchAndroidAuto(hostIp: String, forceFakeNetwork: Boolean = false) {
         if (isLaunching.get()) return
         if (!isLaunching.compareAndSet(false, true)) return
@@ -68,7 +77,9 @@ abstract class BaseStrategy(protected val context: Context, private val scope: C
                 val localPort = proxy.start()
 
                 val connectivityManager = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-                val activeNetwork = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) connectivityManager.activeNetwork else null
+                // FALLBACK TO ID 0 IF OFFLINE
+                val targetNetwork = (if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) connectivityManager.activeNetwork else null)
+                    ?: createFakeNetwork(0)
 
                 val wifiInfo: Parcelable? = try {
                     val clazz = Class.forName("android.net.wifi.WifiInfo")
@@ -82,11 +93,11 @@ abstract class BaseStrategy(protected val context: Context, private val scope: C
                     addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     putExtra("PARAM_HOST_ADDRESS", "127.0.0.1")
                     putExtra("PARAM_SERVICE_PORT", localPort)
-                    activeNetwork?.let { putExtra("PARAM_SERVICE_WIFI_NETWORK", it) }
+                    targetNetwork?.let { putExtra("PARAM_SERVICE_WIFI_NETWORK", it) }
                     wifiInfo?.let { putExtra("wifi_info", it) }
                 }
 
-                Log.i(TAG, "Firing Proxy Intent. LocalPort=$localPort")
+                Log.i(TAG, "Firing Intent. Host=127.0.0.1, Port=$localPort, Network=$targetNetwork")
 
                 // 1. Try via Broadcast (if TransparentTriggerActivity is active)
                 val broadcastIntent = Intent(ACTION_TRIGGER_INTENT).apply {
@@ -128,4 +139,4 @@ abstract class BaseStrategy(protected val context: Context, private val scope: C
         activeProxy = null
         isLaunching.set(false)
     }
-}
+}