Add service connection manager

android/app/src/main/AndroidManifest.xml

@@ -64,20 +64,12 @@
         </activity>
 
         <service
-            android:enabled="true"
-            android:exported="false"
-            android:stopWithTask="false"
-            android:name=".service.LanternService_">
+            android:process=":bg"
+            android:name=".service.LanternService">
         </service>
 
         <receiver android:name = ".model.DeclineCallBroadcastReceiver" />
 
-        <receiver android:name="org.getlantern.lantern.notification.NotificationReceiver" android:exported="true">
-            <intent-filter>
-                <action android:name="org.getlantern.lantern.intent.VPN_DISCONNECTED"/>
-            </intent-filter>
-        </receiver>
-
         <activity
             android:name=".activity.FreeKassaActivity_"
             android:screenOrientation="portrait">
@@ -117,29 +109,13 @@
 
         <service android:name="org.getlantern.lantern.vpn.LanternVpnService"
             android:exported="false"
-            android:permission="android.permission.BIND_VPN_SERVICE">
+            android:permission="android.permission.BIND_VPN_SERVICE"
+            android:process=":bg">
             <intent-filter>
                 <action android:name="android.net.VpnService"/>
             </intent-filter>
         </service>
 
-        <receiver android:name=".notification.Notifier"
-            android:exported="false"> <!-- since we do specify an intent filter, this receiver will
-            be available to other apps by default, which is not what we want. We have to explicitly state that it's private within our app -->
-            <intent-filter>
-                <action android:name="${applicationId}.intent.DATA_USAGE" />
-            </intent-filter>
-        </receiver>
-
-<!--        <receiver android:enabled="true" android:name=".service.AutoStarter"-->
-<!--            android:permission="android.permission.RECEIVE_BOOT_COMPLETED"-->
-<!--            android:exported="true">-->
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.BOOT_COMPLETED" />-->
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-<!--            </intent-filter>-->
-<!--        </receiver>-->
-
         <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
         <meta-data android:name="google_analytics_ssaid_collection_enabled" android:value="false" />
 

android/app/src/main/kotlin/org/getlantern/lantern/Constants.kt

@@ -0,0 +1,9 @@
+package org.getlantern.lantern
+
+object Actions {
+	const val CONNECT_VPN = "org.getlantern.lantern.intent.VPN_CONNECTED"
+	const val DISCONNECT_VPN = "org.getlantern.lantern.intent.VPN_DISCONNECTED"
+
+	const val STOP_SERVICE = "org.getlantern.lantern.service.STOP"
+	const val SERVICE = "org.getlantern.lantern.service"
+}

android/app/src/main/kotlin/org/getlantern/lantern/LanternApp.kt

@@ -1,13 +1,18 @@
 package org.getlantern.lantern
 
 import android.app.Application
+import android.app.NotificationManager
 import android.content.Context
+import android.content.Intent
 import android.os.StrictMode
 import androidx.appcompat.app.AppCompatDelegate
+import androidx.core.content.ContextCompat
 import androidx.multidex.MultiDex
 import org.getlantern.lantern.model.InAppBilling
 import org.getlantern.lantern.model.LanternHttpClient
 import org.getlantern.lantern.model.LanternSessionManager
+import org.getlantern.lantern.notification.Notifications
+import org.getlantern.lantern.service.LanternConnection
 import org.getlantern.lantern.util.debugOnly
 import org.getlantern.lantern.util.LanternProxySelector
 import org.getlantern.lantern.util.SentryUtil
@@ -60,6 +65,7 @@ open class LanternApp : Application() {
 
     override fun attachBaseContext(base: Context) {
         super.attachBaseContext(base)
+        application = this
         // this is necessary running earlier versions of Android
         // multidex support has to be added manually
         // in addition to being enabled in the app build.gradle
@@ -69,11 +75,28 @@ open class LanternApp : Application() {
 
     companion object {
         private val TAG = LanternApp::class.java.simpleName
+
+        lateinit var application: LanternApp
+
         private lateinit var appContext: Context
         private lateinit var inAppBilling: InAppBilling
         private lateinit var lanternHttpClient: LanternHttpClient
         private lateinit var session: LanternSessionManager
 
+        val notificationManager by lazy { application.
+            getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager }
+
+        fun startService(connection: LanternConnection) = ContextCompat.startForegroundService(
+            application, Intent(application, connection.serviceClass).apply {
+                action = if (connection.isVpnService) Actions.CONNECT_VPN else null
+            }
+        )
+
+        fun stopService(connection: LanternConnection) =
+            application.sendBroadcast(Intent(Actions.STOP_SERVICE).
+                setPackage(application.packageName))
+
+
         @JvmStatic
         fun getAppContext(): Context {
             return appContext