brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.4

Browse Source
This commit is contained in:
Mygod
2019-04-28 14:05:52 +08:00
parent 4b9edba173 6aac712a1b
commit 7d2a3e42ea
12 changed files with 66 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/src/main/java/be/mygod/vpnhotspot/util/ServiceForegroundConnector.kt
View File

@@ -5,17 +5,15 @@ import android.content.Context
import android.content.Intent
import android.content.ServiceConnection
import androidx.fragment.app.Fragment
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleObserver
import androidx.lifecycle.DefaultLifecycleObserver
import androidx.lifecycle.LifecycleOwner
import androidx.lifecycle.OnLifecycleEvent
import kotlin.reflect.KClass
/**
* owner also needs to be Context/Fragment.
*/
class ServiceForegroundConnector(private val owner: LifecycleOwner, private val connection: ServiceConnection,
private val clazz: KClass<out Service>) : LifecycleObserver {
private val clazz: KClass<out Service>) : DefaultLifecycleObserver {
init {
owner.lifecycle.addObserver(this)
}
@@ -26,12 +24,10 @@ class ServiceForegroundConnector(private val owner: LifecycleOwner, private val
else -> throw UnsupportedOperationException("Unsupported owner")
}
@OnLifecycleEvent(Lifecycle.Event.ON_START)
fun onStart() {
override fun onStart(owner: LifecycleOwner) {
val context = context
context.bindService(Intent(context, clazz.java), connection, Context.BIND_AUTO_CREATE)
}
@OnLifecycleEvent(Lifecycle.Event.ON_STOP)
fun onStop() = context.stopAndUnbind(connection)
override fun onStop(owner: LifecycleOwner) = context.stopAndUnbind(connection)
}

3
mobile/src/main/java/be/mygod/vpnhotspot/util/SpanFormatter.kt
View File

@@ -59,9 +59,8 @@ object SpanFormatter {
val argTerm = m.group(1)
val modTerm = m.group(2)
val typeTerm = m.group(3)
val cookedArg = when (typeTerm) {
val cookedArg = when (val typeTerm = m.group(3)) {
"%" -> "%"
"n" -> "\n"
else -> {