From f75b522d82d9fc819d8de0cf7fe76f3377041404 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Thu, 14 Mar 2019 19:15:33 +0800
Subject: [PATCH] Fix temp hotspot on Android Q beta

---
 mobile/src/main/AndroidManifest.xml                  |  2 ++
 .../vpnhotspot/manage/LocalOnlyHotspotManager.kt     | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 293052ae..76d87ee1 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -39,6 +39,8 @@
     <uses-permission android:name="android.permission.WRITE_SETTINGS"
                      tools:ignore="ProtectedPermissions"/>
     <uses-permission-sdk-23 android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <!-- Required since Android Q -->
+    <uses-permission-sdk-23 android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <application
         android:name=".App"
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt
index 45001b1d..309d3c48 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/LocalOnlyHotspotManager.kt
@@ -18,6 +18,7 @@ import android.text.style.TypefaceSpan
 import android.view.View
 import android.widget.Toast
 import androidx.core.content.getSystemService
+import androidx.core.os.BuildCompat
 import androidx.core.os.bundleOf
 import androidx.recyclerview.widget.RecyclerView
 import be.mygod.vpnhotspot.DebugHelper
@@ -32,6 +33,11 @@ import java.net.NetworkInterface
 
 @TargetApi(26)
 class LocalOnlyHotspotManager(private val parent: TetheringFragment) : Manager(), ServiceConnection {
+    companion object {
+        val permission = if (BuildCompat.isAtLeastQ())
+            Manifest.permission.ACCESS_FINE_LOCATION else Manifest.permission.ACCESS_COARSE_LOCATION
+    }
+
     class ViewHolder(val binding: ListitemInterfaceBinding) : RecyclerView.ViewHolder(binding.root),
             View.OnClickListener {
         init {
@@ -44,10 +50,8 @@ class LocalOnlyHotspotManager(private val parent: TetheringFragment) : Manager()
             val binder = manager.binder
             if (binder?.iface != null) binder.stop() else {
                 val context = manager.parent.requireContext()
-                if (context.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) !=
-                        PackageManager.PERMISSION_GRANTED) {
-                    manager.parent.requestPermissions(arrayOf(Manifest.permission.ACCESS_COARSE_LOCATION),
-                            TetheringFragment.START_LOCAL_ONLY_HOTSPOT)
+                if (context.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+                    manager.parent.requestPermissions(arrayOf(permission), TetheringFragment.START_LOCAL_ONLY_HOTSPOT)
                     return
                 }
                 /**