- moved acquiring of wakelock to baresip service on create method

(previous commit was about main activity)
This commit is contained in:
Juha Heinanen
2019-04-18 21:52:40 +03:00
parent fa18924542
commit 8c22d96f7b
@@ -33,7 +33,7 @@ class BaresipService: Service() {
internal lateinit var rt: Ringtone internal lateinit var rt: Ringtone
internal lateinit var nm: NotificationManager internal lateinit var nm: NotificationManager
internal lateinit var snb: NotificationCompat.Builder internal lateinit var snb: NotificationCompat.Builder
internal lateinit var wl: PowerManager.WakeLock internal lateinit var wakeLock: PowerManager.WakeLock
internal lateinit var fl: WifiManager.WifiLock internal lateinit var fl: WifiManager.WifiLock
internal var rtTimer: Timer? = null internal var rtTimer: Timer? = null
@@ -80,15 +80,11 @@ class BaresipService: Service() {
} }
) )
val pm = getSystemService(Context.POWER_SERVICE) as PowerManager wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
wl = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "com.tutpro.baresip:wakelog") newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "com.tutpro.baresip:wakelog").apply {
acquire()
/* if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { }
val intent = Intent() }
intent.action = Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS
intent.data = Uri.parse("package:$packageName")
startActivity(intent)
} */
super.onCreate() super.onCreate()
} }
@@ -167,9 +163,8 @@ class BaresipService: Service() {
} }
} }
ContactsActivity.restoreContacts(applicationContext.filesDir) ContactsActivity.restoreContacts(applicationContext.filesDir)
wl.acquire()
Thread(Runnable { baresipStart(filesPath) }).start() Thread(Runnable { baresipStart(filesPath) }).start()
BaresipService.isServiceRunning = true isServiceRunning = true
showStatusNotification() showStatusNotification()
} }
@@ -751,7 +746,7 @@ class BaresipService: Service() {
history.clear() history.clear()
messages.clear() messages.clear()
if (this::nm.isInitialized) nm.cancelAll() if (this::nm.isInitialized) nm.cancelAll()
if (this::wl.isInitialized && wl.isHeld) wl.release() if (this::wakeLock.isInitialized && wakeLock.isHeld) wakeLock.release()
if (this::fl.isInitialized && fl.isHeld) fl.release() if (this::fl.isInitialized && fl.isHeld) fl.release()
isServiceClean = true isServiceClean = true
} }