From 5bae3d99311fe968f733a9143c0c1fb560bd5eff Mon Sep 17 00:00:00 2001 From: darken Date: Wed, 24 Aug 2022 11:40:16 +0200 Subject: [PATCH] Remove in-app email shortcut --- .../ui/settings/support/SupportFragment.kt | 7 ----- .../ui/settings/support/SupportFragmentVM.kt | 26 ------------------- app/src/main/res/xml/preferences_support.xml | 5 ---- 3 files changed, 38 deletions(-) diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt index 689420a8..38821268 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragment.kt @@ -28,17 +28,12 @@ class SupportFragment : PreferenceFragment2() { @Inject lateinit var clipboardHelper: ClipboardHelper private val installIdPref by lazy { findPreference("support.installid")!! } - private val supportMailPref by lazy { findPreference("support.email.darken")!! } override fun onPreferencesCreated() { installIdPref.setOnPreferenceClickListener { vm.copyInstallID() true } - supportMailPref.setOnPreferenceClickListener { - vm.sendSupportMail() - true - } super.onPreferencesCreated() } @@ -52,8 +47,6 @@ class SupportFragment : PreferenceFragment2() { .show() } - vm.emailEvent.observe2(this) { startActivity(it) } - super.onViewCreated(view, savedInstanceState) } } \ No newline at end of file diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt index f6ecd4fb..5fe78d22 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/support/SupportFragmentVM.kt @@ -1,11 +1,7 @@ package eu.darken.capod.main.ui.settings.support -import android.content.Intent -import android.os.Build import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel -import eu.darken.capod.common.BuildConfigWrap -import eu.darken.capod.common.EmailTool import eu.darken.capod.common.InstallId import eu.darken.capod.common.coroutine.DispatcherProvider import eu.darken.capod.common.livedata.SingleLiveEvent @@ -16,33 +12,11 @@ import javax.inject.Inject class SupportFragmentVM @Inject constructor( private val handle: SavedStateHandle, private val dispatcherProvider: DispatcherProvider, - private val emailTool: EmailTool, private val installId: InstallId, ) : ViewModel3(dispatcherProvider) { - val emailEvent = SingleLiveEvent() val clipboardEvent = SingleLiveEvent() - fun sendSupportMail() = launch { - - val bodyInfo = StringBuilder("\n\n\n") - - bodyInfo.append("--- Infos for the developer ---\n") - - bodyInfo.append("App version: ").append(BuildConfigWrap.VERSION_DESCRIPTION_LONG).append("\n") - - bodyInfo.append("Device: ").append(Build.FINGERPRINT).append("\n") - bodyInfo.append("Install ID: ").append(installId.id).append("\n") - - val email = EmailTool.Email( - receipients = listOf("support@darken.eu"), - subject = "[CAPod] Question/Suggestion/Request\n", - body = bodyInfo.toString() - ) - - emailEvent.postValue(emailTool.build(email)) - } - fun copyInstallID() = launch { clipboardEvent.postValue(installId.id) } diff --git a/app/src/main/res/xml/preferences_support.xml b/app/src/main/res/xml/preferences_support.xml index 081b149c..c1aef0ae 100644 --- a/app/src/main/res/xml/preferences_support.xml +++ b/app/src/main/res/xml/preferences_support.xml @@ -17,11 +17,6 @@ android:action="android.intent.action.VIEW" android:data="https://github.com/d4rken-org/capod/issues" /> -