Loading core/src/main/kotlin/foundation/e/accountmanager/ui/setup/ReOAuthActivity.kt +3 −3 Original line number Diff line number Diff line Loading @@ -32,12 +32,12 @@ import androidx.hilt.navigation.compose.hiltViewModel import at.bitfire.davdroid.R import at.bitfire.davdroid.push.PushNotificationManager import at.bitfire.davdroid.sync.SyncDataType import at.bitfire.davdroid.ui.AppTheme import at.bitfire.davdroid.ui.account.AccountSettingsActivity import at.bitfire.davdroid.ui.account.AccountSettingsModel import at.bitfire.davdroid.ui.account.AccountSettingsViewModel import dagger.hilt.android.AndroidEntryPoint import foundation.e.accountmanager.utils.AccountHelper import androidx.compose.ui.res.stringResource import at.bitfire.davdroid.ui.composable.AppTheme @AndroidEntryPoint class ReOAuthActivity : ComponentActivity() { Loading Loading @@ -74,7 +74,7 @@ fun OAuthHandlerScreen( onFinished: () -> Unit, ) { val context = LocalContext.current val model = hiltViewModel { factory: AccountSettingsModel.Factory -> val model = hiltViewModel { factory: AccountSettingsViewModel.Factory -> factory.create(account) } val responseText = stringResource(R.string.account_updated_toast) Loading core/src/main/kotlin/foundation/e/accountmanager/utils/AccountHelper.kt +2 −3 Original line number Diff line number Diff line Loading @@ -23,15 +23,14 @@ import android.app.AlarmManager import android.app.PendingIntent import android.content.Context import android.content.Intent import at.bitfire.davdroid.BuildConfig import at.bitfire.davdroid.settings.AccountSettings import foundation.e.accountmanager.AccountTypes import foundation.e.accountmanager.sync.SyncBroadcastReceiver import java.util.concurrent.TimeUnit object AccountHelper { private const val ACTION_PREFIX = "${BuildConfig.APPLICATION_ID}.action" const val ACCOUNT_EVENTS_PERMISSION = "${BuildConfig.APPLICATION_ID}.permission.ACCOUNT_EVENTS" private const val ACTION_PREFIX = "foundation.e.accountmanager.action" const val ACCOUNT_EVENTS_PERMISSION = "foundation.e.accountmanager.permission.ACCOUNT_EVENTS" const val ACTION_ACCOUNT_REMOVED = "$ACTION_PREFIX.ACCOUNT_REMOVED" const val ACTION_ACCOUNT_ADDED = "$ACTION_PREFIX.ACCOUNT_ADDED" Loading Loading
core/src/main/kotlin/foundation/e/accountmanager/ui/setup/ReOAuthActivity.kt +3 −3 Original line number Diff line number Diff line Loading @@ -32,12 +32,12 @@ import androidx.hilt.navigation.compose.hiltViewModel import at.bitfire.davdroid.R import at.bitfire.davdroid.push.PushNotificationManager import at.bitfire.davdroid.sync.SyncDataType import at.bitfire.davdroid.ui.AppTheme import at.bitfire.davdroid.ui.account.AccountSettingsActivity import at.bitfire.davdroid.ui.account.AccountSettingsModel import at.bitfire.davdroid.ui.account.AccountSettingsViewModel import dagger.hilt.android.AndroidEntryPoint import foundation.e.accountmanager.utils.AccountHelper import androidx.compose.ui.res.stringResource import at.bitfire.davdroid.ui.composable.AppTheme @AndroidEntryPoint class ReOAuthActivity : ComponentActivity() { Loading Loading @@ -74,7 +74,7 @@ fun OAuthHandlerScreen( onFinished: () -> Unit, ) { val context = LocalContext.current val model = hiltViewModel { factory: AccountSettingsModel.Factory -> val model = hiltViewModel { factory: AccountSettingsViewModel.Factory -> factory.create(account) } val responseText = stringResource(R.string.account_updated_toast) Loading
core/src/main/kotlin/foundation/e/accountmanager/utils/AccountHelper.kt +2 −3 Original line number Diff line number Diff line Loading @@ -23,15 +23,14 @@ import android.app.AlarmManager import android.app.PendingIntent import android.content.Context import android.content.Intent import at.bitfire.davdroid.BuildConfig import at.bitfire.davdroid.settings.AccountSettings import foundation.e.accountmanager.AccountTypes import foundation.e.accountmanager.sync.SyncBroadcastReceiver import java.util.concurrent.TimeUnit object AccountHelper { private const val ACTION_PREFIX = "${BuildConfig.APPLICATION_ID}.action" const val ACCOUNT_EVENTS_PERMISSION = "${BuildConfig.APPLICATION_ID}.permission.ACCOUNT_EVENTS" private const val ACTION_PREFIX = "foundation.e.accountmanager.action" const val ACCOUNT_EVENTS_PERMISSION = "foundation.e.accountmanager.permission.ACCOUNT_EVENTS" const val ACTION_ACCOUNT_REMOVED = "$ACTION_PREFIX.ACCOUNT_REMOVED" const val ACTION_ACCOUNT_ADDED = "$ACTION_PREFIX.ACCOUNT_ADDED" Loading