sudoxreboot/fdroiddata
1
0
Fork 0
mirror of https://github.com/sudoxnym/fdroiddata.git synced 2026-05-18 19:59:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New App: de.mm20.launcher2.release

Browse source
This commit is contained in:
fruitsnack 2023-01-19 16:47:12 +00:00 committed by Licaon_Kter
parent 99947c9abe
commit bf6c956612
3 changed files with 1114 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
metadata/de.mm20.launcher2.release.yml Normal file
View file

@ -0,0 +1,89 @@
AntiFeatures:
- UpstreamNonFree
- NonFreeNet
Categories:
- System
- Theming
License: GPL-3.0-or-later
AuthorName: U. N. Owen
WebSite: https://kvaesitso.mm20.de
SourceCode: https://github.com/MM2-0/Kvaesitso
IssueTracker: https://github.com/MM2-0/Kvaesitso/issues
Donate: https://github.com/sponsors/MM2-0
Summary: Search focused launcher
Description: |-
Kvæsitso is a launcher application for Android
which replaces the device's default home screen.
It has been built from scratch, meaning it is not
based on the AOSP launcher (like many other third
party launchers) nor does it try to recreate this
launcher. Instead, Kvæsitso follows its own concepts.
The main feature is a global search which does not
only let you search on device for apps, contacts, and
calendar events, but also on web services like
Wikipedia or your Nextcloud Instance. Additionally it
includes some useful tools, for example a calculator
and a unit converter. You are looking for a document
or an information? Just search for it and Kvæsitso shows
you the fastest way to it.
F-Droid build has the following changes:
* Disabled OneDrive, GDrive and weather integration;
* F-Droid version uses a different versionCode.
Antifeatures:
* NonFreeNet: app uses a third party service for currency
exchange rates;
* UpstreamNonFree: google drive integration depends on
libraries with non-free dependencies.
RepoType: git
Repo: https://github.com/MM2-0/Kvaesitso
Builds:
- versionName: 1.20.0
versionCode: 12000
commit: v1.20.0
subdir: app/app
patch:
- remove_ms-services.patch
- remove_gservices.patch
gradle:
- yes
prebuild:
- sed -i 's/^org\.gradle\.java\.home.*$//' ../../gradle.properties
- sed -i 's/exclude(group\ =\ "com\.google\.guava".*$//' build.gradle.kts
- sed -i 's/versionCode\ =\ versionCodeDate()/versionCode = 12000/' build.gradle.kts
- sed -i 's/versionNameSuffix.*$//' build.gradle.kts
MaintainerNotes: |-
Kvaesitso uses several external APIs for search providers.
Several of them require signing up to obtain a developer API
key: gdrive and onedrive search, openweathermap, HERE
and Meteorologisk institutt. It's not possible for users
to provide these keys as explained here:
https://github.com/MM2-0/Kvaesitso/issues/227#issuecomment-1366826219
Therefore, these features are disabled in F-Droid build.
Kvaesitso uses a non-whitelisted microsoft maven repo for
OneDrive integration. The libraries used are open source,
but we still remove the respective code from the source,
since onedrive integration is disabled anyway.
Patches:
remove_ms-services.patch removes microsoft azure sdk maven
repo and its usage (onedrive integration) across the project.
remove_gservices.patch removes gdrive integration, as one
of dependencies it relies on contains known non-free classes,
according to f-droid scanner.
Kvaesitso appends build date to both versionName and versionCode,
so we replace it in the build with static ones.
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: 1.20.0
CurrentVersionCode: 12000

483
metadata/de.mm20.launcher2.release/remove_gservices.patch Normal file
View file

@ -0,0 +1,483 @@
diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index a6ccbdfd..35a613f0 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -116,7 +116,6 @@ dependencies {
implementation(project(":data:customattrs"))
implementation(project(":data:favorites"))
implementation(project(":data:files"))
- implementation(project(":libs:g-services"))
implementation(project(":core:i18n"))
implementation(project(":services:icons"))
implementation(project(":core:ktx"))
diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts
index 61a9f34b..f4dae074 100644
--- a/app/ui/build.gradle.kts
+++ b/app/ui/build.gradle.kts
@@ -137,7 +137,6 @@ dependencies {
implementation(project(":data:websites"))
implementation(project(":data:unitconverter"))
implementation(project(":libs:nextcloud"))
- implementation(project(":libs:g-services"))
implementation(project(":libs:owncloud"))
implementation(project(":services:accounts"))
implementation(project(":services:backup"))
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt
index f7971d23..adfc61e5 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt
@@ -99,74 +99,5 @@ fun AccountsSettingsScreen() {
)
}
}
- if (viewModel.isGoogleAvailable) {
- item {
- PreferenceCategory(title = stringResource(R.string.preference_category_services_google)) {
- val account by viewModel.googleUser.observeAsState()
- if (account == null) {
- Box(modifier = Modifier
- .padding(start = 56.dp)
- .padding(16.dp)) {
- GoogleSigninButton(
- onClick = {
- viewModel.signIn(
- context as AppCompatActivity,
- AccountType.Google
- )
- }
- )
- }
- } else {
- Preference(
- title = stringResource(R.string.preference_signin_logout),
- summary = account?.userName?.let {
- stringResource(R.string.preference_signin_user, it)
- },
- onClick = {
- viewModel.signOut(AccountType.Google)
- }
- )
- }
- }
- }
- }
- }
-}
-
-@Composable
-fun GoogleSigninButton(
- onClick: () -> Unit,
-) {
- Surface(
- modifier = Modifier.height(40.dp),
- shadowElevation = 1.dp,
- color = Color.White,
- shape = RoundedCornerShape(2.dp),
- onClick = onClick
- ) {
- Row(
- verticalAlignment = Alignment.CenterVertically
- ) {
- Box(
- modifier = Modifier
- .size(40.dp)
- .background(Color.White),
- contentAlignment = Alignment.Center
- ) {
- Image(
- modifier = Modifier.size(18.dp),
- painter = painterResource(id = R.drawable.ic_google_g),
- contentDescription = null
- )
- }
- Text(
- modifier = Modifier.padding(start = 13.dp, end = 8.dp),
- text = stringResource(id = R.string.preference_google_signin),
- fontFamily = FontFamily.SansSerif,
- color = Color(0f, 0f, 0f, 0.54f),
- fontSize = 14.sp,
- fontWeight = FontWeight.Medium
- )
- }
}
}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt
index 4ed1373a..25a306d6 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt
@@ -14,9 +14,7 @@ import org.koin.core.component.inject
class AccountsSettingsScreenVM : ViewModel(), KoinComponent {
private val accountsRepository: AccountsRepository by inject()
- val isGoogleAvailable = accountsRepository.isSupported(AccountType.Google)
- val googleUser = MutableLiveData<Account?>(null)
val nextcloudUser = MutableLiveData<Account?>(null)
val owncloudUser = MutableLiveData<Account?>(null)
@@ -25,7 +23,6 @@ class AccountsSettingsScreenVM : ViewModel(), KoinComponent {
fun onResume() {
viewModelScope.launch {
loading.value = true
- googleUser.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Google)
nextcloudUser.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Nextcloud)
owncloudUser.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Owncloud)
loading.value = false
@@ -39,7 +36,6 @@ class AccountsSettingsScreenVM : ViewModel(), KoinComponent {
fun signOut(accountType: AccountType) {
accountsRepository.signout(accountType)
when(accountType){
- AccountType.Google -> googleUser.value = null
AccountType.Nextcloud -> nextcloudUser.value = null
AccountType.Owncloud -> owncloudUser.value = null
}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt
index a5f2936b..cda05229 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt
@@ -15,7 +15,7 @@ class BuildInfoSettingsScreenVM : ViewModel(), KoinComponent {
private val availableWeatherProviders = weatherRepository.getAvailableProviders()
val buildFeatures = mapOf(
- "Accounts: Google" to accountsRepository.isSupported(AccountType.Google),
+ "Accounts: Google" to false,
"Accounts: Microsoft" to false,
"Weather providers: HERE" to availableWeatherProviders.contains(WeatherProvider.Here),
"Weather providers: Met No" to availableWeatherProviders.contains(WeatherProvider.MetNo),
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
index 1a9fcbc1..a5348a45 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
@@ -139,39 +139,6 @@ fun FileSearchSettingsScreen() {
},
enabled = owncloudAccount != null
)
-
- val gdrive by viewModel.gdrive.observeAsState()
- val googleAccount by viewModel.googleAccount.observeAsState()
- AnimatedVisibility(googleAccount == null) {
- Banner(
- text = stringResource(R.string.no_account_google),
- icon = Icons.Rounded.AccountBox,
- primaryAction = {
- TextButton(onClick = {
- viewModel.login(
- context as AppCompatActivity,
- AccountType.Google
- )
- }) {
- Text(
- stringResource(R.string.connect_account),
- )
- }
- },
- modifier = Modifier.padding(16.dp)
- )
- }
- SwitchPreference(
- title = stringResource(R.string.preference_search_gdrive),
- summary = googleAccount?.let {
- stringResource(R.string.preference_search_gdrive_summary, it.userName)
- } ?: stringResource(R.string.preference_summary_not_logged_in),
- value = gdrive == true && googleAccount != null,
- onValueChanged = {
- viewModel.setGdrive(it)
- },
- enabled = googleAccount != null
- )
}
}
}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt
index cc8e096a..c5bb0e4f 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt
@@ -27,7 +27,6 @@ class FileSearchSettingsScreenVM : ViewModel(), KoinComponent {
val loading = MutableLiveData(true)
val nextcloudAccount = MutableLiveData<Account?>(null)
val owncloudAccount = MutableLiveData<Account?>(null)
- val googleAccount = MutableLiveData<Account?>(null)
fun onResume() {
viewModelScope.launch {
@@ -35,7 +34,6 @@ class FileSearchSettingsScreenVM : ViewModel(), KoinComponent {
accountsRepository.getCurrentlySignedInAccount(AccountType.Nextcloud)
owncloudAccount.value =
accountsRepository.getCurrentlySignedInAccount(AccountType.Owncloud)
- googleAccount.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Google)
loading.value = false
}
}
@@ -70,21 +68,6 @@ class FileSearchSettingsScreenVM : ViewModel(), KoinComponent {
}
}
- val gdrive = dataStore.data.map { it.fileSearch.gdrive }.asLiveData()
- fun setGdrive(gdrive: Boolean) {
- viewModelScope.launch {
- dataStore.updateData {
- it.toBuilder()
- .setFileSearch(
- it.fileSearch
- .toBuilder()
- .setGdrive(gdrive)
- )
- .build()
- }
- }
- }
-
val owncloud = dataStore.data.map { it.fileSearch.owncloud }.asLiveData()
fun setOwncloud(owncloud: Boolean) {
viewModelScope.launch {
diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts
index cf99cc0b..bd3a4da1 100644
--- a/data/files/build.gradle.kts
+++ b/data/files/build.gradle.kts
@@ -46,7 +46,6 @@ dependencies {
implementation(project(":core:base"))
implementation(project(":core:ktx"))
- implementation(project(":libs:g-services"))
implementation(project(":libs:nextcloud"))
implementation(project(":libs:owncloud"))
implementation(project(":core:i18n"))
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt b/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt
index 42ae2a56..ff930e6d 100644
--- a/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt
+++ b/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt
@@ -2,7 +2,6 @@ package de.mm20.launcher2.files
import android.content.Context
import de.mm20.launcher2.files.providers.FileProvider
-import de.mm20.launcher2.files.providers.GDriveFileProvider
import de.mm20.launcher2.files.providers.LocalFileProvider
import de.mm20.launcher2.files.providers.NextcloudFileProvider
import de.mm20.launcher2.files.providers.OwncloudFileProvider
@@ -24,7 +23,6 @@ interface FileRepository {
fun search(
query: String,
local: Boolean = true,
- gdrive: Boolean = true,
nextcloud: Boolean = true,
owncloud: Boolean = true,
): Flow<ImmutableList<File>>
@@ -49,7 +47,6 @@ internal class FileRepositoryImpl(
override fun search(
query: String,
local: Boolean,
- gdrive: Boolean,
nextcloud: Boolean,
owncloud: Boolean
) = channelFlow {
@@ -61,7 +58,6 @@ internal class FileRepositoryImpl(
val providers = mutableListOf<FileProvider>()
if (local) providers.add(LocalFileProvider(context, permissionsManager))
- if (gdrive) providers.add(GDriveFileProvider(context))
if (nextcloud) providers.add(NextcloudFileProvider(nextcloudClient))
if (owncloud) providers.add(OwncloudFileProvider(owncloudClient))
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt
deleted file mode 100644
index f6287616..00000000
--- a/data/files/src/main/java/de/mm20/launcher2/files/providers/GDriveFileProvider.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package de.mm20.launcher2.files.providers
-
-import android.content.Context
-import de.mm20.launcher2.files.R
-import de.mm20.launcher2.gservices.DriveFileMeta
-import de.mm20.launcher2.gservices.GoogleApiHelper
-import de.mm20.launcher2.search.data.File
-import de.mm20.launcher2.search.data.GDriveFile
-
-internal class GDriveFileProvider(
- private val context: Context
-) : FileProvider {
- override suspend fun search(query: String): List<File> {
- if (query.length < 4) return emptyList()
- val driveFiles = GoogleApiHelper.getInstance(context).queryGDriveFiles(query)
- return driveFiles.map {
- GDriveFile(
- fileId = it.fileId,
- label = it.label,
- size = it.size,
- mimeType = it.mimeType,
- isDirectory = it.isDirectory,
- path = "",
- directoryColor = it.directoryColor,
- viewUri = it.viewUri,
- metaData = getMetadata(it.metadata)
- )
- }
- }
-
- private fun getMetadata(file: DriveFileMeta): List<Pair<Int, String>> {
- val metaData = mutableListOf<Pair<Int, String>>()
- val owners = file.owners
- metaData.add(R.string.file_meta_owner to owners.joinToString(separator = ", "))
- val width = file.width ?: file.width
- val height = file.height ?: file.height
- if (width != null && height != null) metaData.add(R.string.file_meta_dimensions to "${width}x$height")
- return metaData
- }
-}
\ No newline at end of file
diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts
index f4158d42..0f24031c 100644
--- a/services/accounts/build.gradle.kts
+++ b/services/accounts/build.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
implementation(libs.koin.android)
- implementation(project(":libs:g-services"))
implementation(project(":libs:owncloud"))
implementation(project(":libs:nextcloud"))
diff --git a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt
index 89554215..615a3c7b 100644
--- a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt
+++ b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt
@@ -1,7 +1,6 @@
package de.mm20.launcher2.accounts
enum class AccountType {
- Google,
Nextcloud,
Owncloud,
}
diff --git a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt
index 94542793..8420d957 100644
--- a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt
+++ b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt
@@ -2,7 +2,6 @@ package de.mm20.launcher2.accounts
import android.app.Activity
import android.content.Context
-import de.mm20.launcher2.gservices.GoogleApiHelper
import de.mm20.launcher2.nextcloud.NextcloudApiHelper
import de.mm20.launcher2.owncloud.OwncloudClient
import kotlinx.coroutines.CoroutineScope
@@ -27,17 +26,11 @@ internal class AccountsRepositoryImpl(
) : AccountsRepository {
private val scope = CoroutineScope(Job() + Dispatchers.Default)
- private val googleApiHelper = GoogleApiHelper.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.Nextcloud ->
scope.launch {
nextcloudApiHelper.login(context)
@@ -51,9 +44,6 @@ internal class AccountsRepositoryImpl(
override fun signout(accountType: AccountType) {
when (accountType) {
- AccountType.Google -> {
- googleApiHelper.logout()
- }
AccountType.Nextcloud -> {
scope.launch {
nextcloudApiHelper.logout()
@@ -67,7 +57,6 @@ internal class AccountsRepositoryImpl(
override fun isSupported(accountType: AccountType): Boolean {
return when (accountType) {
- AccountType.Google -> googleApiHelper.isAvailable()
AccountType.Nextcloud -> true
AccountType.Owncloud -> true
}
@@ -75,9 +64,6 @@ internal class AccountsRepositoryImpl(
override suspend fun getCurrentlySignedInAccount(accountType: AccountType): Account? {
return when (accountType) {
- AccountType.Google -> {
- getGoogleAccount()
- }
AccountType.Nextcloud -> {
getNextcloudAccount()
}
@@ -87,12 +73,6 @@ internal class AccountsRepositoryImpl(
}
}
- private suspend fun getGoogleAccount(): Account? {
- return googleApiHelper.getAccount()?.let {
- Account(it.name, AccountType.Google)
- }
- }
-
private suspend fun getNextcloudAccount(): Account? {
return nextcloudApiHelper.getLoggedInUser()?.let {
Account(it.displayName, AccountType.Nextcloud)
diff --git a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
index 8d05a8ef..ed48112a 100644
--- a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
+++ b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
@@ -21,7 +21,6 @@ import de.mm20.launcher2.search.data.Calculator
import de.mm20.launcher2.search.data.CalendarEvent
import de.mm20.launcher2.search.data.Contact
import de.mm20.launcher2.search.data.File
-import de.mm20.launcher2.search.data.GDriveFile
import de.mm20.launcher2.search.data.LauncherApp
import de.mm20.launcher2.search.data.LocalFile
import de.mm20.launcher2.search.data.NextcloudFile
@@ -174,14 +173,13 @@ internal class SearchServiceImpl(
}
}
}
- if (files.localFiles || files.owncloud || files.gdrive || files.nextcloud) {
+ if (files.localFiles || files.owncloud || files.nextcloud) {
launch {
fileRepository.search(
query,
local = files.localFiles,
nextcloud = files.nextcloud,
owncloud = files.owncloud,
- gdrive = files.gdrive,
)
.withCustomLabels(customAttributesRepository)
.collectLatest { r ->
@@ -204,7 +202,6 @@ internal class SearchServiceImpl(
files.localFiles && it is LocalFile ||
files.nextcloud && it is NextcloudFile ||
files.owncloud && it is OwncloudFile ||
- files.gdrive && it is GDriveFile ||
wikipedia.enabled && it is Wikipedia ||
websites.enabled && it is Website ||
calendars.enabled && it is CalendarEvent ||
diff --git a/settings.gradle.kts b/settings.gradle.kts
index cf378170..055585d8 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -206,15 +206,6 @@ dependencyResolutionManagement {
library("mathparser", "org.mariuszgromada.math", "MathParser.org-mXparser")
.version("4.4.2")
- library("google.auth", "com.google.auth", "google-auth-library-oauth2-http")
- .version("1.11.0")
- library("google.apiclient", "com.google.api-client", "google-api-client-android")
- .version("2.0.0")
- library("google.drive", "com.google.apis", "google-api-services-drive")
- .version("v3-rev197-1.25.0")
- library("google.oauth2", "com.google.apis", "google-api-services-oauth2")
- .version("v2-rev157-1.25.0")
-
library("gson", "com.google.code.gson", "gson")
.version("2.9.1")
@@ -287,4 +278,3 @@ include(":libs:material-color-utilities")
include(":libs:nextcloud")
include(":libs:owncloud")
include(":libs:webdav")
-include(":libs:g-services")

542
metadata/de.mm20.launcher2.release/remove_ms-services.patch Normal file
View file

@ -0,0 +1,542 @@
diff --git a/app/app/build.gradle.kts b/app/app/build.gradle.kts
index 63de2d9d..a6ccbdfd 100644
--- a/app/app/build.gradle.kts
+++ b/app/app/build.gradle.kts
@@ -120,7 +120,6 @@ dependencies {
implementation(project(":core:i18n"))
implementation(project(":services:icons"))
implementation(project(":core:ktx"))
- implementation(project(":libs:ms-services"))
implementation(project(":services:music"))
implementation(project(":libs:nextcloud"))
implementation(project(":data:notifications"))
@@ -140,4 +139,4 @@ dependencies {
// Uncomment this if you want annoying notifications in your debug builds yelling at you how terrible your code is
//debugImplementation(libs.leakcanary)
-}
\ No newline at end of file
+}
diff --git a/app/ui/build.gradle.kts b/app/ui/build.gradle.kts
index 649ccada..61a9f34b 100644
--- a/app/ui/build.gradle.kts
+++ b/app/ui/build.gradle.kts
@@ -138,9 +138,8 @@ dependencies {
implementation(project(":data:unitconverter"))
implementation(project(":libs:nextcloud"))
implementation(project(":libs:g-services"))
- implementation(project(":libs:ms-services"))
implementation(project(":libs:owncloud"))
implementation(project(":services:accounts"))
implementation(project(":services:backup"))
implementation(project(":data:search-actions"))
-}
\ No newline at end of file
+}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt
index e4e4e9cd..f7971d23 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreen.kt
@@ -99,33 +99,6 @@ fun AccountsSettingsScreen() {
)
}
}
- if (viewModel.isMicrosoftAvailable) {
- item {
- PreferenceCategory(title = stringResource(R.string.preference_category_services_microsoft)) {
- val account by viewModel.msUser.observeAsState()
- Preference(
- title = if (account != null) {
- stringResource(R.string.preference_signin_logout)
- } else {
- stringResource(R.string.preference_ms_signin)
- },
- summary = account?.let {
- stringResource(R.string.preference_signin_user, it.userName)
- } ?: stringResource(R.string.preference_ms_signin_summary),
- onClick = {
- if (account != null) {
- viewModel.signOut(AccountType.Microsoft)
- } else {
- viewModel.signIn(
- context as AppCompatActivity,
- AccountType.Microsoft
- )
- }
- }
- )
- }
- }
- }
if (viewModel.isGoogleAvailable) {
item {
PreferenceCategory(title = stringResource(R.string.preference_category_services_google)) {
@@ -196,4 +169,4 @@ fun GoogleSigninButton(
)
}
}
-}
\ No newline at end of file
+}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt
index 0b49d1ef..4ed1373a 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/accounts/AccountsSettingsScreenVM.kt
@@ -15,10 +15,8 @@ class AccountsSettingsScreenVM : ViewModel(), KoinComponent {
private val accountsRepository: AccountsRepository by inject()
val isGoogleAvailable = accountsRepository.isSupported(AccountType.Google)
- val isMicrosoftAvailable = accountsRepository.isSupported(AccountType.Microsoft)
val googleUser = MutableLiveData<Account?>(null)
- val msUser= MutableLiveData<Account?>(null)
val nextcloudUser = MutableLiveData<Account?>(null)
val owncloudUser = MutableLiveData<Account?>(null)
@@ -29,7 +27,6 @@ class AccountsSettingsScreenVM : ViewModel(), KoinComponent {
loading.value = true
googleUser.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Google)
nextcloudUser.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Nextcloud)
- msUser.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Microsoft)
owncloudUser.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Owncloud)
loading.value = false
}
@@ -43,9 +40,8 @@ class AccountsSettingsScreenVM : ViewModel(), KoinComponent {
accountsRepository.signout(accountType)
when(accountType){
AccountType.Google -> googleUser.value = null
- AccountType.Microsoft -> msUser.value = null
AccountType.Nextcloud -> nextcloudUser.value = null
AccountType.Owncloud -> owncloudUser.value = null
}
}
-}
\ No newline at end of file
+}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt
index b562b629..a5f2936b 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/buildinfo/BuildInfoSettingsScreenVM.kt
@@ -16,9 +16,9 @@ class BuildInfoSettingsScreenVM : ViewModel(), KoinComponent {
val buildFeatures = mapOf(
"Accounts: Google" to accountsRepository.isSupported(AccountType.Google),
- "Accounts: Microsoft" to accountsRepository.isSupported(AccountType.Microsoft),
+ "Accounts: Microsoft" to false,
"Weather providers: HERE" to availableWeatherProviders.contains(WeatherProvider.Here),
"Weather providers: Met No" to availableWeatherProviders.contains(WeatherProvider.MetNo),
"Weather providers: OpenWeatherMap" to availableWeatherProviders.contains(WeatherProvider.OpenWeatherMap),
)
-}
\ No newline at end of file
+}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
index 7fc96986..1a9fcbc1 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreen.kt
@@ -140,39 +140,6 @@ fun FileSearchSettingsScreen() {
enabled = owncloudAccount != null
)
- val onedrive by viewModel.onedrive.observeAsState()
- val microsoftAccount by viewModel.microsoftAccount.observeAsState()
- AnimatedVisibility(microsoftAccount == null) {
- Banner(
- text = stringResource(R.string.no_account_microsoft),
- icon = Icons.Rounded.AccountBox,
- primaryAction = {
- TextButton(onClick = {
- viewModel.login(
- context as AppCompatActivity,
- AccountType.Microsoft
- )
- }) {
- Text(
- stringResource(R.string.connect_account),
- )
- }
- },
- modifier = Modifier.padding(16.dp)
- )
- }
- SwitchPreference(
- title = stringResource(R.string.preference_search_onedrive),
- summary = microsoftAccount?.let {
- stringResource(R.string.preference_search_onedrive_summary, it.userName)
- } ?: stringResource(R.string.preference_summary_not_logged_in),
- value = onedrive == true && microsoftAccount != null,
- onValueChanged = {
- viewModel.setOneDrive(it)
- },
- enabled = microsoftAccount != null
- )
-
val gdrive by viewModel.gdrive.observeAsState()
val googleAccount by viewModel.googleAccount.observeAsState()
AnimatedVisibility(googleAccount == null) {
@@ -208,4 +175,4 @@ fun FileSearchSettingsScreen() {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt
index a05b2592..cc8e096a 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/filesearch/FileSearchSettingsScreenVM.kt
@@ -27,7 +27,6 @@ class FileSearchSettingsScreenVM : ViewModel(), KoinComponent {
val loading = MutableLiveData(true)
val nextcloudAccount = MutableLiveData<Account?>(null)
val owncloudAccount = MutableLiveData<Account?>(null)
- val microsoftAccount = MutableLiveData<Account?>(null)
val googleAccount = MutableLiveData<Account?>(null)
fun onResume() {
@@ -36,8 +35,6 @@ class FileSearchSettingsScreenVM : ViewModel(), KoinComponent {
accountsRepository.getCurrentlySignedInAccount(AccountType.Nextcloud)
owncloudAccount.value =
accountsRepository.getCurrentlySignedInAccount(AccountType.Owncloud)
- microsoftAccount.value =
- accountsRepository.getCurrentlySignedInAccount(AccountType.Microsoft)
googleAccount.value = accountsRepository.getCurrentlySignedInAccount(AccountType.Google)
loading.value = false
}
@@ -88,21 +85,6 @@ class FileSearchSettingsScreenVM : ViewModel(), KoinComponent {
}
}
- val onedrive = dataStore.data.map { it.fileSearch.onedrive }.asLiveData()
- fun setOneDrive(onedrive: Boolean) {
- viewModelScope.launch {
- dataStore.updateData {
- it.toBuilder()
- .setFileSearch(
- it.fileSearch
- .toBuilder()
- .setOnedrive(onedrive)
- )
- .build()
- }
- }
- }
-
val owncloud = dataStore.data.map { it.fileSearch.owncloud }.asLiveData()
fun setOwncloud(owncloud: Boolean) {
viewModelScope.launch {
@@ -125,4 +107,4 @@ class FileSearchSettingsScreenVM : ViewModel(), KoinComponent {
fun login(context: AppCompatActivity, accountType: AccountType) {
accountsRepository.signin(context, accountType)
}
-}
\ No newline at end of file
+}
diff --git a/build.gradle.kts b/build.gradle.kts
index 47d4a8d2..ae5772e9 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -17,7 +17,6 @@ allprojects {
repositories {
google()
mavenCentral()
- maven(url = "https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1")
jcenter() // For tinypinyin
}
}
@@ -26,4 +25,4 @@ tasks.create<Delete>("clean") {
delete(rootProject.buildDir)
}
-apply(from = "docs/deps-graph.gradle")
\ No newline at end of file
+apply(from = "docs/deps-graph.gradle")
diff --git a/data/files/build.gradle.kts b/data/files/build.gradle.kts
index 8beae1bb..cf99cc0b 100644
--- a/data/files/build.gradle.kts
+++ b/data/files/build.gradle.kts
@@ -46,10 +46,9 @@ dependencies {
implementation(project(":core:base"))
implementation(project(":core:ktx"))
- implementation(project(":libs:ms-services"))
implementation(project(":libs:g-services"))
implementation(project(":libs:nextcloud"))
implementation(project(":libs:owncloud"))
implementation(project(":core:i18n"))
implementation(project(":core:permissions"))
-}
\ No newline at end of file
+}
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt b/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt
index a1ba695f..42ae2a56 100644
--- a/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt
+++ b/data/files/src/main/java/de/mm20/launcher2/files/FilesRepository.kt
@@ -5,7 +5,6 @@ import de.mm20.launcher2.files.providers.FileProvider
import de.mm20.launcher2.files.providers.GDriveFileProvider
import de.mm20.launcher2.files.providers.LocalFileProvider
import de.mm20.launcher2.files.providers.NextcloudFileProvider
-import de.mm20.launcher2.files.providers.OneDriveFileProvider
import de.mm20.launcher2.files.providers.OwncloudFileProvider
import de.mm20.launcher2.nextcloud.NextcloudApiHelper
import de.mm20.launcher2.owncloud.OwncloudClient
@@ -26,7 +25,6 @@ interface FileRepository {
query: String,
local: Boolean = true,
gdrive: Boolean = true,
- onedrive: Boolean = true,
nextcloud: Boolean = true,
owncloud: Boolean = true,
): Flow<ImmutableList<File>>
@@ -52,7 +50,6 @@ internal class FileRepositoryImpl(
query: String,
local: Boolean,
gdrive: Boolean,
- onedrive: Boolean,
nextcloud: Boolean,
owncloud: Boolean
) = channelFlow {
@@ -65,7 +62,6 @@ internal class FileRepositoryImpl(
if (local) providers.add(LocalFileProvider(context, permissionsManager))
if (gdrive) providers.add(GDriveFileProvider(context))
- if (onedrive) providers.add(OneDriveFileProvider(context))
if (nextcloud) providers.add(NextcloudFileProvider(nextcloudClient))
if (owncloud) providers.add(OwncloudFileProvider(owncloudClient))
@@ -87,4 +83,4 @@ internal class FileRepositoryImpl(
}
}
}
-}
\ No newline at end of file
+}
diff --git a/data/files/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt b/data/files/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt
deleted file mode 100644
index 57a34b9d..00000000
--- a/data/files/src/main/java/de/mm20/launcher2/files/providers/OneDriveFileProvider.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package de.mm20.launcher2.files.providers
-
-import android.content.Context
-import de.mm20.launcher2.files.R
-import de.mm20.launcher2.msservices.DriveItem
-import de.mm20.launcher2.msservices.MicrosoftGraphApiHelper
-import de.mm20.launcher2.search.data.File
-import de.mm20.launcher2.search.data.OneDriveFile
-
-internal class OneDriveFileProvider(
- private val context: Context
-) : FileProvider {
- override suspend fun search(query: String): List<File> {
- if (query.length < 4) return emptyList()
- val driveItems = MicrosoftGraphApiHelper.getInstance(context).queryOneDriveFiles(query)
- ?: return emptyList()
- val files = mutableListOf<OneDriveFile>()
- for (driveItem in driveItems) {
- files += OneDriveFile(
- fileId = driveItem.id,
- label = driveItem.label,
- path = "",
- mimeType = driveItem.mimeType,
- size = driveItem.size,
- isDirectory = driveItem.isDirectory,
- metaData = getMetaData(driveItem),
- webUrl = driveItem.webUrl
- )
- }
- return files
- }
-
- private fun getMetaData(driveItem: DriveItem): List<Pair<Int, String>> {
- val metaData = mutableListOf<Pair<Int, String>>()
- driveItem.meta.owner?.let {
- metaData.add(R.string.file_meta_owner to it)
- } ?: driveItem.meta.createdBy?.let {
- metaData.add(R.string.file_meta_owner to it)
- }
- val width = driveItem.meta.width
- val height = driveItem.meta.height
-
- if (width != null && height != null) {
- metaData.add(R.string.file_meta_dimensions to "${width}x${height}")
- }
- return metaData
- }
-}
\ No newline at end of file
diff --git a/services/accounts/build.gradle.kts b/services/accounts/build.gradle.kts
index a639739c..f4158d42 100644
--- a/services/accounts/build.gradle.kts
+++ b/services/accounts/build.gradle.kts
@@ -41,8 +41,7 @@ dependencies {
implementation(libs.koin.android)
implementation(project(":libs:g-services"))
- implementation(project(":libs:ms-services"))
implementation(project(":libs:owncloud"))
implementation(project(":libs:nextcloud"))
-}
\ No newline at end of file
+}
diff --git a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt
index 982c6b88..89554215 100644
--- a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt
+++ b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountType.kt
@@ -2,7 +2,6 @@ package de.mm20.launcher2.accounts
enum class AccountType {
Google,
- Microsoft,
Nextcloud,
Owncloud,
-}
\ No newline at end of file
+}
diff --git a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt
index e5801eef..94542793 100644
--- a/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt
+++ b/services/accounts/src/main/java/de/mm20/launcher2/accounts/AccountsRepository.kt
@@ -3,7 +3,6 @@ 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
@@ -29,7 +28,6 @@ internal class AccountsRepositoryImpl(
private val scope = CoroutineScope(Job() + Dispatchers.Default)
private val googleApiHelper = GoogleApiHelper.getInstance(context)
- private val msGraphApiHelper = MicrosoftGraphApiHelper.getInstance(context)
private val nextcloudApiHelper = NextcloudApiHelper(context)
private val owncloudApiHelper = OwncloudClient(context)
@@ -40,11 +38,6 @@ internal class AccountsRepositoryImpl(
googleApiHelper.login(context)
}
}
- AccountType.Microsoft -> {
- scope.launch {
- msGraphApiHelper.login(context)
- }
- }
AccountType.Nextcloud ->
scope.launch {
nextcloudApiHelper.login(context)
@@ -61,11 +54,6 @@ internal class AccountsRepositoryImpl(
AccountType.Google -> {
googleApiHelper.logout()
}
- AccountType.Microsoft -> {
- scope.launch {
- msGraphApiHelper.logout()
- }
- }
AccountType.Nextcloud -> {
scope.launch {
nextcloudApiHelper.logout()
@@ -80,7 +68,6 @@ internal class AccountsRepositoryImpl(
override fun isSupported(accountType: AccountType): Boolean {
return when (accountType) {
AccountType.Google -> googleApiHelper.isAvailable()
- AccountType.Microsoft -> msGraphApiHelper.isAvailable()
AccountType.Nextcloud -> true
AccountType.Owncloud -> true
}
@@ -91,9 +78,6 @@ internal class AccountsRepositoryImpl(
AccountType.Google -> {
getGoogleAccount()
}
- AccountType.Microsoft -> {
- getMicrosoftAccount()
- }
AccountType.Nextcloud -> {
getNextcloudAccount()
}
@@ -109,12 +93,6 @@ internal class AccountsRepositoryImpl(
}
}
- 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)
@@ -127,4 +105,4 @@ internal class AccountsRepositoryImpl(
}
}
-}
\ No newline at end of file
+}
diff --git a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
index 221575a8..8d05a8ef 100644
--- a/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
+++ b/services/search/src/main/java/de/mm20/launcher2/search/SearchService.kt
@@ -25,7 +25,6 @@ import de.mm20.launcher2.search.data.GDriveFile
import de.mm20.launcher2.search.data.LauncherApp
import de.mm20.launcher2.search.data.LocalFile
import de.mm20.launcher2.search.data.NextcloudFile
-import de.mm20.launcher2.search.data.OneDriveFile
import de.mm20.launcher2.search.data.OwncloudFile
import de.mm20.launcher2.search.data.UnitConverter
import de.mm20.launcher2.search.data.Website
@@ -175,14 +174,13 @@ internal class SearchServiceImpl(
}
}
}
- if (files.localFiles || files.owncloud || files.onedrive || files.gdrive || files.nextcloud) {
+ if (files.localFiles || files.owncloud || files.gdrive || files.nextcloud) {
launch {
fileRepository.search(
query,
local = files.localFiles,
nextcloud = files.nextcloud,
owncloud = files.owncloud,
- onedrive = files.onedrive,
gdrive = files.gdrive,
)
.withCustomLabels(customAttributesRepository)
@@ -206,7 +204,6 @@ internal class SearchServiceImpl(
files.localFiles && it is LocalFile ||
files.nextcloud && it is NextcloudFile ||
files.owncloud && it is OwncloudFile ||
- files.onedrive && it is OneDriveFile ||
files.gdrive && it is GDriveFile ||
wikipedia.enabled && it is Wikipedia ||
websites.enabled && it is Website ||
@@ -253,4 +250,4 @@ internal data class SearchResults(
fun toList(): List<Searchable> {
return searchActions + (apps + shortcuts + contacts + calendars + files + websites + wikipedia + other).distinctBy { it.key } + calculators + unitConverters
}
-}
\ No newline at end of file
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
index fc2ef193..cf378170 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -221,11 +221,6 @@ dependencyResolutionManagement {
library("guava", "com.google.guava", "guava")
.version("31.1-android")
- library("microsoft.graph", "com.microsoft.graph", "microsoft-graph")
- .version("5.34.0")
- library("microsoft.identity", "com.microsoft.identity.client", "msal")
- .version("4.0.1")
-
version("protobuf", "3.14.0")
library("protobuf.protoc", "com.google.protobuf", "protoc")
.versionRef("protobuf")
@@ -293,4 +288,3 @@ include(":libs:nextcloud")
include(":libs:owncloud")
include(":libs:webdav")
include(":libs:g-services")
-include(":libs:ms-services")