yetangitu/timelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/timelimit-android.git synced 2025-10-05 10:49:26 +02:00
Code Issues Projects Releases Wiki Activity

Allow switching to the default user from the notification area

Browse source
This commit is contained in:
Jonas L 2019-04-22 00:00:00 +00:00
parent c37e2e5d1c
commit fe3a8f7153
4 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/io/timelimit/android/integration/platform/PlatformIntegration.kt
View file

@ -183,4 +183,9 @@ class NewPermissionStatusConverter {
}
@Parcelize
data class AppStatusMessage(val title: String, val text: String, val subtext: String? = null): Parcelable
data class AppStatusMessage(
val title: String,
val text: String,
val subtext: String? = null,
val showSwitchToDefaultUserOption: Boolean = false
): Parcelable

40
app/src/main/java/io/timelimit/android/integration/platform/android/BackgroundService.kt
View file

@ -21,12 +21,16 @@ import android.app.Service
import android.content.Context
import android.content.Intent
import android.os.IBinder
import android.widget.Toast
import androidx.core.app.NotificationCompat
import androidx.core.content.ContextCompat
import io.timelimit.android.R
import io.timelimit.android.coroutines.runAsync
import io.timelimit.android.integration.platform.AppStatusMessage
import io.timelimit.android.livedata.waitForNonNullValue
import io.timelimit.android.logic.DefaultAppLogic
import io.timelimit.android.sync.actions.SignOutAtDeviceAction
import io.timelimit.android.sync.actions.apply.ApplyActionUtil
import io.timelimit.android.ui.MainActivity
class BackgroundService: Service() {
@ -34,6 +38,7 @@ class BackgroundService: Service() {
private const val ACTION = "a"
private const val ACTION_SET_NOTIFICATION = "a"
private const val ACTION_REVOKE_TEMPORARILY_ALLOWED_APPS = "b"
private const val ACTION_SWITCH_TO_DEFAULT_USER = "c"
private const val EXTRA_NOTIFICATION = "b"
fun setStatusMessage(status: AppStatusMessage?, context: Context) {
@ -53,6 +58,9 @@ class BackgroundService: Service() {
fun prepareRevokeTemporarilyAllowed(context: Context) = Intent(context, BackgroundService::class.java)
.putExtra(ACTION, ACTION_REVOKE_TEMPORARILY_ALLOWED_APPS)
fun prepareSwitchToDefaultUser(context: Context) = Intent(context, BackgroundService::class.java)
.putExtra(ACTION, ACTION_SWITCH_TO_DEFAULT_USER)
}
private val notificationManager: NotificationManager by lazy {
@ -99,6 +107,24 @@ class BackgroundService: Service() {
.setAutoCancel(false)
.setOngoing(true)
.setPriority(NotificationCompat.PRIORITY_LOW)
.let { builder ->
if (appStatusMessage.showSwitchToDefaultUserOption) {
builder.addAction(
NotificationCompat.Action.Builder(
R.drawable.ic_account_circle_black_24dp,
getString(R.string.manage_device_default_user_switch_btn),
PendingIntent.getService(
this@BackgroundService,
PendingIntentIds.SWITCH_TO_DEFAULT_USER,
prepareSwitchToDefaultUser(this@BackgroundService),
PendingIntent.FLAG_UPDATE_CURRENT
)
).build()
)
}
builder
}
.build()
if (didPostNotification) {
@ -111,6 +137,20 @@ class BackgroundService: Service() {
runAsync {
DefaultAppLogic.with(this@BackgroundService).backgroundTaskLogic.resetTemporarilyAllowedApps()
}
} else if (action == ACTION_SWITCH_TO_DEFAULT_USER) {
runAsync {
val logic = DefaultAppLogic.with(this@BackgroundService)
if (logic.fullVersion.shouldProvideFullVersionFunctions.waitForNonNullValue()) {
ApplyActionUtil.applyAppLogicAction(
appLogic = logic,
action = SignOutAtDeviceAction,
ignoreIfDeviceIsNotConfigured = true
)
} else {
Toast.makeText(this@BackgroundService, R.string.purchase_required_dialog_title, Toast.LENGTH_LONG).show()
}
}
}
}

1
app/src/main/java/io/timelimit/android/integration/platform/android/Notification.kt
View file

@ -68,4 +68,5 @@ object NotificationChannels {
object PendingIntentIds {
const val OPEN_MAIN_APP = 1
const val REVOKE_TEMPORARILY_ALLOWED = 2
const val SWITCH_TO_DEFAULT_USER = 3
}

3
app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt
View file

@ -187,7 +187,8 @@ class BackgroundTaskLogic(val appLogic: AppLogic) {
appLogic.platformIntegration.setAppStatusMessage(
AppStatusMessage(
title = appLogic.context.getString(R.string.background_logic_timeout_title),
text = appLogic.context.getString(R.string.background_logic_timeout_text)
text = appLogic.context.getString(R.string.background_logic_timeout_text),
showSwitchToDefaultUserOption = true
)
)
appLogic.platformIntegration.setShowBlockingOverlay(false)