Migrate account settings
This commit is contained in:
@@ -0,0 +1 @@
|
||||
/build
|
||||
@@ -0,0 +1,48 @@
|
||||
plugins {
|
||||
id("com.android.library")
|
||||
id("kotlin-android")
|
||||
}
|
||||
|
||||
android {
|
||||
compileSdk = sdk.versions.compileSdk.get().toInt()
|
||||
|
||||
defaultConfig {
|
||||
minSdk = sdk.versions.minSdk.get().toInt()
|
||||
targetSdk = sdk.versions.targetSdk.get().toInt()
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
consumerProguardFiles("consumer-rules.pro")
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
isMinifyEnabled = false
|
||||
proguardFiles(
|
||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
||||
"proguard-rules.pro"
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
}
|
||||
|
||||
kotlinOptions {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(libs.bundles.kotlin)
|
||||
implementation(libs.androidx.core)
|
||||
|
||||
implementation(libs.koin.android)
|
||||
|
||||
implementation(project(":g-services"))
|
||||
implementation(project(":ms-services"))
|
||||
implementation(project(":owncloud"))
|
||||
implementation(project(":nextcloud"))
|
||||
|
||||
}
|
||||
Vendored
+21
@@ -0,0 +1,21 @@
|
||||
# Add project specific ProGuard rules here.
|
||||
# You can control the set of applied configuration files using the
|
||||
# proguardFiles setting in build.gradle.
|
||||
#
|
||||
# For more details, see
|
||||
# http://developer.android.com/guide/developing/tools/proguard.html
|
||||
|
||||
# If your project uses WebView with JS, uncomment the following
|
||||
# and specify the fully qualified class name to the JavaScript interface
|
||||
# class:
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
|
||||
# Uncomment this to preserve the line number information for
|
||||
# debugging stack traces.
|
||||
#-keepattributes SourceFile,LineNumberTable
|
||||
|
||||
# If you keep the line number information, uncomment this to
|
||||
# hide the original source file name.
|
||||
#-renamesourcefileattribute SourceFile
|
||||
@@ -0,0 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="de.mm20.launcher2.accounts">
|
||||
|
||||
</manifest>
|
||||
@@ -0,0 +1,6 @@
|
||||
package de.mm20.launcher2.accounts
|
||||
|
||||
data class Account(
|
||||
val userName: String,
|
||||
val type: AccountType,
|
||||
)
|
||||
@@ -0,0 +1,8 @@
|
||||
package de.mm20.launcher2.accounts
|
||||
|
||||
enum class AccountType {
|
||||
Google,
|
||||
Microsoft,
|
||||
Nextcloud,
|
||||
Owncloud,
|
||||
}
|
||||
@@ -0,0 +1,132 @@
|
||||
package de.mm20.launcher2.accounts
|
||||
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import de.mm20.launcher2.gservices.GoogleApiHelper
|
||||
import de.mm20.launcher2.msservices.MicrosoftGraphApiHelper
|
||||
import de.mm20.launcher2.nextcloud.NextcloudApiHelper
|
||||
import de.mm20.launcher2.owncloud.OwncloudClient
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.MutableStateFlow
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
interface AccountsRepository {
|
||||
fun signin(context: Activity, accountType: AccountType)
|
||||
fun signout(accountType: AccountType)
|
||||
|
||||
/**
|
||||
* Whether support for this account type is enabled in this build
|
||||
*/
|
||||
fun isSupported(accountType: AccountType): Boolean
|
||||
|
||||
suspend fun getCurrentlySignedInAccount(accountType: AccountType): Account?
|
||||
}
|
||||
|
||||
internal class AccountsRepositoryImpl(
|
||||
private val context: Context
|
||||
) : AccountsRepository {
|
||||
private val scope = CoroutineScope(Job() + Dispatchers.Main)
|
||||
|
||||
private val googleApiHelper = GoogleApiHelper.getInstance(context)
|
||||
private val msGraphApiHelper = MicrosoftGraphApiHelper.getInstance(context)
|
||||
private val nextcloudApiHelper = NextcloudApiHelper(context)
|
||||
private val owncloudApiHelper = OwncloudClient(context)
|
||||
|
||||
override fun signin(context: Activity, accountType: AccountType) {
|
||||
when (accountType) {
|
||||
AccountType.Google -> {
|
||||
scope.launch {
|
||||
googleApiHelper.login(context)
|
||||
}
|
||||
}
|
||||
AccountType.Microsoft -> {
|
||||
scope.launch {
|
||||
msGraphApiHelper.login(context)
|
||||
}
|
||||
}
|
||||
AccountType.Nextcloud ->
|
||||
scope.launch {
|
||||
nextcloudApiHelper.login(context)
|
||||
}
|
||||
AccountType.Owncloud ->
|
||||
scope.launch {
|
||||
owncloudApiHelper.login(context, 0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun signout(accountType: AccountType) {
|
||||
when (accountType) {
|
||||
AccountType.Google -> {
|
||||
googleApiHelper.logout()
|
||||
}
|
||||
AccountType.Microsoft -> {
|
||||
scope.launch {
|
||||
msGraphApiHelper.logout()
|
||||
}
|
||||
}
|
||||
AccountType.Nextcloud -> {
|
||||
scope.launch {
|
||||
nextcloudApiHelper.logout()
|
||||
}
|
||||
}
|
||||
AccountType.Owncloud -> {
|
||||
owncloudApiHelper.logout()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun isSupported(accountType: AccountType): Boolean {
|
||||
return when (accountType) {
|
||||
AccountType.Google -> googleApiHelper.isAvailable()
|
||||
AccountType.Microsoft -> msGraphApiHelper.isAvailable()
|
||||
AccountType.Nextcloud -> true
|
||||
AccountType.Owncloud -> true
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getCurrentlySignedInAccount(accountType: AccountType): Account? {
|
||||
return when (accountType) {
|
||||
AccountType.Google -> {
|
||||
getGoogleAccount()
|
||||
}
|
||||
AccountType.Microsoft -> {
|
||||
getMicrosoftAccount()
|
||||
}
|
||||
AccountType.Nextcloud -> {
|
||||
getNextcloudAccount()
|
||||
}
|
||||
AccountType.Owncloud -> {
|
||||
getOwncloudAccount()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getGoogleAccount(): Account? {
|
||||
return googleApiHelper.getAccount()?.let {
|
||||
Account(it.name, AccountType.Google)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getMicrosoftAccount(): Account? {
|
||||
return msGraphApiHelper.getUser()?.let {
|
||||
Account(it.name, AccountType.Microsoft)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getNextcloudAccount(): Account? {
|
||||
return nextcloudApiHelper.getLoggedInUser()?.let {
|
||||
Account(it.displayName, AccountType.Nextcloud)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getOwncloudAccount(): Account? {
|
||||
return owncloudApiHelper.getLoggedInUser()?.let {
|
||||
Account(it.displayName, AccountType.Owncloud)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
package de.mm20.launcher2.accounts
|
||||
|
||||
import org.koin.android.ext.koin.androidContext
|
||||
import org.koin.dsl.module
|
||||
|
||||
val accountsModule = module {
|
||||
factory<AccountsRepository> { AccountsRepositoryImpl(androidContext()) }
|
||||
}
|
||||
Reference in New Issue
Block a user