From 0fd8d7e55d94c0969e19b7cd40602fb244a2bb2c Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Mon, 5 May 2025 15:08:04 +0200 Subject: [PATCH] remove device name library --- Habitica/build.gradle.kts | 2 -- .../ui/fragments/support/BugFixFragment.kt | 22 +++++-------------- .../fragments/support/FAQOverviewFragment.kt | 21 +++++------------- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/Habitica/build.gradle.kts b/Habitica/build.gradle.kts index 8fe3fb7c1..8c1d34b31 100644 --- a/Habitica/build.gradle.kts +++ b/Habitica/build.gradle.kts @@ -158,8 +158,6 @@ dependencies { //Desugaring coreLibraryDesugaring(libs.desugar) - implementation(libs.device.names) - // IAP Handling / Verification implementation(libs.billing) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt index bc60104be..4704e9a14 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/BugFixFragment.kt @@ -9,7 +9,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.os.bundleOf -import androidx.lifecycle.lifecycleScope import com.habitrpg.android.habitica.R import com.habitrpg.android.habitica.databinding.FragmentSupportBugFixBinding import com.habitrpg.android.habitica.databinding.KnownIssueBinding @@ -18,16 +17,13 @@ import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment import com.habitrpg.android.habitica.ui.viewmodels.MainUserViewModel import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.common.habitica.helpers.AppTestingLevel -import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.common.habitica.helpers.MainNavigationController -import com.jaredrummler.android.device.DeviceName import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.launch import javax.inject.Inject +import androidx.core.net.toUri @AndroidEntryPoint class BugFixFragment : BaseMainFragment() { - private var deviceInfo: DeviceName.DeviceInfo? = null override var binding: FragmentSupportBugFixBinding? = null override fun createBinding( @@ -59,12 +55,6 @@ class BugFixFragment : BaseMainFragment() { ) { super.onViewCreated(view, savedInstanceState) - lifecycleScope.launch(ExceptionHandler.coroutine()) { - DeviceName.with(context).request { info, _ -> - deviceInfo = info - } - } - binding?.reportBugButton?.setOnClickListener { sendEmail("[Android] Bugreport") } @@ -89,7 +79,7 @@ class BugFixFragment : BaseMainFragment() { 0 )?.versionName ?: "" - } catch (e: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { "" } } @@ -102,15 +92,15 @@ class BugFixFragment : BaseMainFragment() { 0 )?.versionCode ?: 0 - } catch (e: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { 0 } } private fun sendEmail(subject: String) { val version = Build.VERSION.SDK_INT - val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName() - val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER + val deviceName = Build.MODEL + val manufacturer = Build.MANUFACTURER val newLine = "%0D%0A" var bodyOfEmail = Uri.encode("Device: $manufacturer $deviceName") + @@ -162,7 +152,7 @@ class BugFixFragment : BaseMainFragment() { "mailto:" + appConfigManager.supportEmail() + "?subject=" + Uri.encode(subject) + "&body=" + bodyOfEmail - emailIntent.data = Uri.parse(mailto) + emailIntent.data = mailto.toUri() startActivity(Intent.createChooser(emailIntent, "Choose an Email client:")) } diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt index f0d16286f..ae5e5284e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/support/FAQOverviewFragment.kt @@ -32,19 +32,16 @@ import com.habitrpg.android.habitica.ui.views.UsernameLabel import com.habitrpg.common.habitica.extensions.dpToPx import com.habitrpg.common.habitica.extensions.layoutInflater import com.habitrpg.common.habitica.helpers.AppTestingLevel -import com.habitrpg.common.habitica.helpers.ExceptionHandler import com.habitrpg.common.habitica.helpers.MainNavigationController import com.habitrpg.common.habitica.helpers.launchCatching import com.habitrpg.common.habitica.models.PlayerTier -import com.jaredrummler.android.device.DeviceName import dagger.hilt.android.AndroidEntryPoint -import kotlinx.coroutines.launch import javax.inject.Inject import kotlin.math.max +import androidx.core.net.toUri @AndroidEntryPoint class FAQOverviewFragment : BaseMainFragment() { - private var deviceInfo: DeviceName.DeviceInfo? = null override var binding: FragmentFaqOverviewBinding? = null @Inject @@ -73,7 +70,7 @@ class FAQOverviewFragment : BaseMainFragment() { 0 )?.versionName ?: "" - } catch (e: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { "" } } @@ -86,7 +83,7 @@ class FAQOverviewFragment : BaseMainFragment() { 0 )?.versionCode ?: 0 - } catch (e: PackageManager.NameNotFoundException) { + } catch (_: PackageManager.NameNotFoundException) { 0 } } @@ -112,12 +109,6 @@ class FAQOverviewFragment : BaseMainFragment() { binding?.npcHeader?.namePlate?.setText(R.string.tavern_owner) binding?.npcHeader?.descriptionView?.isVisible = false - lifecycleScope.launch(ExceptionHandler.coroutine()) { - DeviceName.with(context).request { info, _ -> - deviceInfo = info - } - } - binding?.healthSection?.findViewById(R.id.icon_view)?.setImageBitmap( HabiticaIconsHelper.imageOfHeartLarge() ) @@ -203,8 +194,8 @@ class FAQOverviewFragment : BaseMainFragment() { private fun sendEmail(subject: String) { val version = Build.VERSION.SDK_INT - val deviceName = deviceInfo?.name ?: DeviceName.getDeviceName() - val manufacturer = deviceInfo?.manufacturer ?: Build.MANUFACTURER + val deviceName = Build.MODEL + val manufacturer = Build.MANUFACTURER val newLine = "%0D%0A" var bodyOfEmail = Uri.encode("Device: $manufacturer $deviceName") + @@ -256,7 +247,7 @@ class FAQOverviewFragment : BaseMainFragment() { "mailto:" + appConfigManager.supportEmail() + "?subject=" + Uri.encode(subject) + "&body=" + bodyOfEmail - emailIntent.data = Uri.parse(mailto) + emailIntent.data = mailto.toUri() startActivity(Intent.createChooser(emailIntent, "Choose an Email client:")) }