Move Utils.kt

mobile/src/main/java/be/mygod/vpnhotspot/LocalOnlyHotspotService.kt

@@ -8,6 +8,9 @@ import android.widget.Toast
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.net.IpNeighbourMonitor
 import be.mygod.vpnhotspot.net.TetheringManager
+import be.mygod.vpnhotspot.util.broadcastReceiver
+import be.mygod.vpnhotspot.util.debugLog
+import be.mygod.vpnhotspot.util.intentFilter
 
 @RequiresApi(26)
 class LocalOnlyHotspotService : IpNeighbourMonitoringService() {

mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt

@@ -31,6 +31,9 @@ import be.mygod.vpnhotspot.net.TetherType
 import be.mygod.vpnhotspot.net.TetheringManager
 import be.mygod.vpnhotspot.net.wifi.P2pSupplicantConfiguration
 import be.mygod.vpnhotspot.net.wifi.WifiP2pDialog
+import be.mygod.vpnhotspot.util.broadcastReceiver
+import be.mygod.vpnhotspot.util.formatAddresses
+import be.mygod.vpnhotspot.util.intentFilter
 import java.net.NetworkInterface
 import java.net.SocketException
 import java.util.*

mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt

@@ -21,8 +21,7 @@ import be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper.netId
 import be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper.requestPersistentGroupInfo
 import be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper.setWifiP2pChannels
 import be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper.startWps
-import be.mygod.vpnhotspot.util.StickyEvent0
+import be.mygod.vpnhotspot.util.*
-import be.mygod.vpnhotspot.util.StickyEvent1
 import java.lang.reflect.InvocationTargetException
 import java.net.InetAddress
 

mobile/src/main/java/be/mygod/vpnhotspot/SettingsPreferenceFragment.kt

@@ -11,6 +11,7 @@ import android.support.v4.content.FileProvider
 import android.widget.Toast
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.net.Routing
+import be.mygod.vpnhotspot.util.loggerSuStream
 import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompatDividers
 import java.io.File
 import java.io.IOException

mobile/src/main/java/be/mygod/vpnhotspot/TetheringFragment.kt

@@ -34,6 +34,9 @@ import be.mygod.vpnhotspot.databinding.ListitemManageTetherBinding
 import be.mygod.vpnhotspot.net.TetherType
 import be.mygod.vpnhotspot.net.TetheringManager
 import be.mygod.vpnhotspot.net.wifi.WifiApManager
+import be.mygod.vpnhotspot.util.broadcastReceiver
+import be.mygod.vpnhotspot.util.formatAddresses
+import be.mygod.vpnhotspot.util.intentFilter
 import java.lang.reflect.InvocationTargetException
 import java.net.NetworkInterface
 import java.net.SocketException

mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt

@@ -8,6 +8,8 @@ import be.mygod.vpnhotspot.net.IpNeighbourMonitor
 import be.mygod.vpnhotspot.net.Routing
 import be.mygod.vpnhotspot.net.TetheringManager
 import be.mygod.vpnhotspot.net.VpnMonitor
+import be.mygod.vpnhotspot.util.broadcastReceiver
+import be.mygod.vpnhotspot.util.intentFilter
 import java.net.InetAddress
 import java.net.SocketException
 

mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbourMonitor.kt

@@ -4,8 +4,8 @@ import android.os.Handler
 import android.util.Log
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.R
-import be.mygod.vpnhotspot.debugLog
+import be.mygod.vpnhotspot.util.debugLog
-import be.mygod.vpnhotspot.thread
+import be.mygod.vpnhotspot.util.thread
 import java.io.InterruptedIOException
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
@@ -57,7 +57,8 @@ class IpNeighbourMonitor private constructor() : Runnable {
             thread("$TAG-error") {
                 try {
                     monitor.errorStream.bufferedReader().forEachLine { Log.e(TAG, it) }
-                } catch (ignore: InterruptedIOException) { }
+                } catch (ignore: InterruptedIOException) {
+                }
             }
             try {
                 monitor.inputStream.bufferedReader().forEachLine {
@@ -76,7 +77,8 @@ class IpNeighbourMonitor private constructor() : Runnable {
                 val pool = Executors.newScheduledThreadPool(1)
                 pool.scheduleAtFixedRate(this, 1, 1, TimeUnit.SECONDS)
                 this.pool = pool
-            } catch (ignore: InterruptedIOException) { }
+            } catch (ignore: InterruptedIOException) {
+            }
         }
     }
 

mobile/src/main/java/be/mygod/vpnhotspot/net/Routing.kt

@@ -3,8 +3,8 @@ package be.mygod.vpnhotspot.net
 import android.os.Build
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.R
-import be.mygod.vpnhotspot.debugLog
+import be.mygod.vpnhotspot.util.debugLog
-import be.mygod.vpnhotspot.noisySu
+import be.mygod.vpnhotspot.util.noisySu
 import java.net.Inet4Address
 import java.net.InetAddress
 import java.net.NetworkInterface

mobile/src/main/java/be/mygod/vpnhotspot/net/VpnMonitor.kt

@@ -5,7 +5,7 @@ import android.net.Network
 import android.net.NetworkCapabilities
 import android.net.NetworkRequest
 import be.mygod.vpnhotspot.App.Companion.app
-import be.mygod.vpnhotspot.debugLog
+import be.mygod.vpnhotspot.util.debugLog
 import java.net.InetAddress
 
 object VpnMonitor : ConnectivityManager.NetworkCallback() {

mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt

@@ -5,8 +5,8 @@ import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import be.mygod.vpnhotspot.App.Companion.app
-import be.mygod.vpnhotspot.loggerSu
+import be.mygod.vpnhotspot.util.loggerSu
-import be.mygod.vpnhotspot.noisySu
+import be.mygod.vpnhotspot.util.noisySu
 import java.io.File
 
 class P2pSupplicantConfiguration {

mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt

@@ -1,4 +1,4 @@
-package be.mygod.vpnhotspot
+package be.mygod.vpnhotspot.util
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -9,6 +9,8 @@ import android.support.annotation.DrawableRes
 import android.util.Log
 import android.widget.ImageView
 import be.mygod.vpnhotspot.App.Companion.app
+import be.mygod.vpnhotspot.BuildConfig
+import be.mygod.vpnhotspot.R
 import java.io.IOException
 import java.io.InputStream
 import java.net.NetworkInterface