feat: F-Droid flavor

app/build.gradle

@@ -1,12 +1,9 @@
 plugins {
     id 'com.android.application'
-    id 'com.google.gms.google-services'
-    id 'com.google.firebase.crashlytics'
     id 'kotlin-android'
     id 'kotlinx-serialization'
     id 'org.jetbrains.kotlin.android'
     id 'com.google.devtools.ksp'
-
 }
 
 def gitCommitHash = providers.exec {
@@ -22,15 +19,31 @@ android {
         targetSdk 34
         versionCode ((System.currentTimeMillis() / 60000).toInteger())
         versionName "2.1.0"
+        versionCode 210
         signingConfig signingConfigs.debug
     }
 
+    flavorDimensions "store"
+    productFlavors {
+        fdroid {
+            // F-Droid specific configuration
+            dimension "store"
+            versionNameSuffix "-fdroid"
+        }
+        google {
+            // Google Play specific configuration
+            dimension "store"
+            isDefault true
+        }
+    }
+
     buildTypes {
         alpha {
-            applicationIdSuffix ".beta" // keep as the same application by popular request
+            applicationIdSuffix ".beta" // keep as beta by popular request
             versionNameSuffix "-alpha01"
             manifestPlaceholders = [icon_placeholder: "@mipmap/ic_launcher_alpha", icon_placeholder_round: "@mipmap/ic_launcher_alpha_round"]
             debuggable System.getenv("CI") == null
+            isDefault true
         }
         debug {
             applicationIdSuffix ".beta"
@@ -46,6 +59,7 @@ android {
     }
     buildFeatures {
         viewBinding true
+        buildConfig true
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -59,6 +73,11 @@ android {
 }
 
 dependencies {
+
+    //    FireBase
+    googleImplementation platform('com.google.firebase:firebase-bom:32.2.3')
+    googleImplementation 'com.google.firebase:firebase-analytics-ktx:21.5.0'
+    googleImplementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.1'
 //    Core
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.browser:browser:1.7.0'
@@ -84,11 +103,6 @@ dependencies {
     implementation "com.github.bumptech.glide:okhttp3-integration:$glide_version"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'
 
-//    FireBase
-    implementation platform('com.google.firebase:firebase-bom:32.2.3')
-    implementation 'com.google.firebase:firebase-analytics-ktx:21.5.0'
-    implementation 'com.google.firebase:firebase-crashlytics-ktx:18.6.1'
-
 //    Exoplayer
     ext.exo_version = '1.2.1'
     implementation "androidx.media3:media3-exoplayer:$exo_version"

app/src/fdroid/java/ani/dantotsu/connections/crashlytics/CrashlyticsFactory.kt

@@ -0,0 +1,9 @@
+package ani.dantotsu.connections.crashlytics
+
+class CrashlyticsFactory {
+    companion object {
+        fun createCrashlytics(): CrashlyticsInterface {
+            return CrashlyticsStub()
+        }
+    }
+}

app/src/fdroid/java/ani/dantotsu/others/AppUpdater.kt

@@ -0,0 +1,9 @@
+package ani.dantotsu.others
+
+import androidx.fragment.app.FragmentActivity
+
+object AppUpdater {
+    suspend fun check(activity: FragmentActivity, post: Boolean = false) {
+        //no-op
+    }
+}

app/src/google/java/ani/dantotsu/connections/crashlytics/CrashlyticsFactory.kt

@@ -0,0 +1,9 @@
+package ani.dantotsu.connections.crashlytics
+
+class CrashlyticsFactory {
+    companion object {
+        fun createCrashlytics(): CrashlyticsInterface {
+            return FirebaseCrashlytics()
+        }
+    }
+}

app/src/google/java/ani/dantotsu/connections/crashlytics/FirebaseCrashlytics.kt

@@ -0,0 +1,28 @@
+package ani.dantotsu.connections.crashlytics
+
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import com.google.firebase.crashlytics.ktx.crashlytics
+import com.google.firebase.ktx.Firebase
+
+class FirebaseCrashlytics : CrashlyticsInterface {
+    override fun logException(e: Throwable) {
+        FirebaseCrashlytics.getInstance().recordException(e)
+    }
+
+    override fun log(message: String) {
+        FirebaseCrashlytics.getInstance().log(message)
+    }
+
+    override fun setUserId(id: String) {
+        Firebase.crashlytics.setUserId(id)
+    }
+
+    override fun setCustomKey(key: String, value: String) {
+        FirebaseCrashlytics.getInstance().setCustomKey(key, value)
+    }
+
+    override fun setCrashlyticsCollectionEnabled(enabled: Boolean) {
+        FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(enabled)
+    }
+
+}

app/src/google/java/ani/dantotsu/others/AppUpdater.kt

@@ -187,7 +187,7 @@ object AppUpdater {
         return true
     }
 
-    fun openApk(context: Context, uri: Uri) {
+    private fun openApk(context: Context, uri: Uri) {
         try {
             uri.path?.let {
                 val contentUri = FileProvider.getUriForFile(

app/src/main/java/ani/dantotsu/App.kt

@@ -8,6 +8,7 @@ import androidx.multidex.MultiDex
 import androidx.multidex.MultiDexApplication
 import ani.dantotsu.aniyomi.anime.custom.AppModule
 import ani.dantotsu.aniyomi.anime.custom.PreferenceModule
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.others.DisabledReports
 import ani.dantotsu.parsers.AnimeSources
 import ani.dantotsu.parsers.MangaSources
@@ -17,9 +18,6 @@ import ani.dantotsu.settings.SettingsActivity
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
 import com.google.android.material.color.DynamicColors
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
@@ -55,28 +53,32 @@ class App : MultiDexApplication() {
         super.onCreate()
 
         PrefManager.init(this)
+        Injekt.importModule(AppModule(this))
+        Injekt.importModule(PreferenceModule(this))
+
+        val crashlytics = Injekt.get<CrashlyticsInterface>()
 
         val useMaterialYou: Boolean = PrefManager.getVal(PrefName.UseMaterialYou)
         if (useMaterialYou) {
             DynamicColors.applyToActivitiesIfAvailable(this)
-            //TODO: HarmonizedColors
         }
         registerActivityLifecycleCallbacks(mFTActivityLifecycleCallbacks)
 
-        Firebase.crashlytics.setCrashlyticsCollectionEnabled(!DisabledReports)
+        crashlytics.setCrashlyticsCollectionEnabled(!DisabledReports)
         (PrefManager.getVal(PrefName.SharedUserID) as Boolean).let {
             if (!it) return@let
             val dUsername = PrefManager.getVal(PrefName.DiscordUserName, null as String?)
             val aUsername = PrefManager.getVal(PrefName.AnilistUserName, null as String?)
-            if (dUsername != null || aUsername != null) {
+            if (dUsername != null) {
-                Firebase.crashlytics.setUserId("$dUsername - $aUsername")
+                crashlytics.setCustomKey("dUsername", dUsername)
+            }
+            if (aUsername != null) {
+                crashlytics.setCustomKey("aUsername", aUsername)
             }
         }
-        FirebaseCrashlytics.getInstance()
+        crashlytics.setCustomKey("device Info", SettingsActivity.getDeviceInfo())
-            .setCustomKey("device Info", SettingsActivity.getDeviceInfo())
+
 
-        Injekt.importModule(AppModule(this))
-        Injekt.importModule(PreferenceModule(this))
 
         initializeNetwork(baseContext)
 

app/src/main/java/ani/dantotsu/Functions.kt

@@ -44,6 +44,7 @@ import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.BuildConfig.APPLICATION_ID
 import ani.dantotsu.connections.anilist.Genre
 import ani.dantotsu.connections.anilist.api.FuzzyDate
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.ItemCountDownBinding
 import ani.dantotsu.media.Media
 import ani.dantotsu.parsers.ShowResponse
@@ -61,11 +62,12 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.internal.ViewUtils
 import com.google.android.material.snackbar.Snackbar
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.Gson
 import eu.kanade.tachiyomi.data.notification.Notifications
 import kotlinx.coroutines.*
 import nl.joery.animatedbottombar.AnimatedBottomBar
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.io.*
 import java.lang.Runnable
 import java.lang.reflect.Field
@@ -872,7 +874,7 @@ fun snackString(s: String?, activity: Activity? = null, clipboard: String? = nul
         }
     } catch (e: Exception) {
         logger(e.stackTraceToString())
-        FirebaseCrashlytics.getInstance().recordException(e)
+        Injekt.get<CrashlyticsInterface>().logException(e)
     }
 }
 

app/src/main/java/ani/dantotsu/aniyomi/anime/custom/InjektModules.kt

@@ -7,6 +7,9 @@ import androidx.annotation.OptIn
 import androidx.core.content.ContextCompat
 import androidx.media3.common.util.UnstableApi
 import androidx.media3.database.StandaloneDatabaseProvider
+import ani.dantotsu.BuildConfig
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
+import ani.dantotsu.connections.crashlytics.CrashlyticsStub
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.media.manga.MangaCache
 import ani.dantotsu.parsers.novel.NovelExtensionManager
@@ -53,6 +56,10 @@ class AppModule(val app: Application) : InjektModule {
 
         addSingletonFactory { StandaloneDatabaseProvider(app) }
 
+        addSingletonFactory<CrashlyticsInterface> {
+            ani.dantotsu.connections.crashlytics.CrashlyticsFactory.createCrashlytics()
+        }
+
         addSingletonFactory { MangaCache() }
 
         ContextCompat.getMainExecutor(app).execute {

app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt

@@ -5,6 +5,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import ani.dantotsu.BuildConfig
 import ani.dantotsu.R
 import ani.dantotsu.connections.discord.Discord
 import ani.dantotsu.connections.mal.MAL
@@ -100,7 +101,9 @@ class AnilistHomeViewModel : ViewModel() {
         Anilist.getSavedToken()
         MAL.getSavedToken(context)
         Discord.getSavedToken(context)
-        if (PrefManager.getVal(PrefName.CheckUpdate)) AppUpdater.check(context)
+        if (!BuildConfig.FLAVOR.contains("fdroid")) {
+            if (PrefManager.getVal(PrefName.CheckUpdate)) AppUpdater.check(context)
+        }
         genres.postValue(Anilist.query.getGenresAndTags(context))
     }
 

app/src/main/java/ani/dantotsu/connections/crashlytics/CrashlyticsInterface.kt

@@ -0,0 +1,9 @@
+package ani.dantotsu.connections.crashlytics
+
+interface CrashlyticsInterface {
+    fun logException(e: Throwable)
+    fun log(message: String)
+    fun setUserId(id: String)
+    fun setCustomKey(key: String, value: String)
+    fun setCrashlyticsCollectionEnabled(enabled: Boolean)
+}

app/src/main/java/ani/dantotsu/connections/crashlytics/CrashlyticsStub.kt

@@ -0,0 +1,24 @@
+package ani.dantotsu.connections.crashlytics
+
+class CrashlyticsStub : CrashlyticsInterface {
+    override fun logException(e: Throwable) {
+        //no-op
+    }
+
+    override fun log(message: String) {
+        //no-op
+    }
+
+    override fun setUserId(id: String) {
+        //no-op
+    }
+
+    override fun setCustomKey(key: String, value: String) {
+        //no-op
+    }
+
+    override fun setCrashlyticsCollectionEnabled(enabled: Boolean) {
+        //no-op
+    }
+
+}

app/src/main/java/ani/dantotsu/download/anime/AnimeDownloaderService.kt

@@ -21,6 +21,7 @@ import androidx.media3.exoplayer.offline.DownloadManager
 import androidx.media3.exoplayer.offline.DownloadService
 import ani.dantotsu.FileUrl
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currActivity
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
@@ -34,7 +35,6 @@ import ani.dantotsu.parsers.Subtitle
 import ani.dantotsu.parsers.Video
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -277,7 +277,7 @@ class AnimeDownloaderService : Service() {
                                     DownloadedType.Type.ANIME,
                                 )
                             )
-                            FirebaseCrashlytics.getInstance().recordException(
+                            Injekt.get<CrashlyticsInterface>().logException(
                                 Exception(
                                     "Anime Download failed:" +
                                             " ${download.failureReason}" +
@@ -333,7 +333,7 @@ class AnimeDownloaderService : Service() {
                 logger("Exception while downloading file: ${e.message}")
                 snackString("Exception while downloading file: ${e.message}")
                 e.printStackTrace()
-                FirebaseCrashlytics.getInstance().recordException(e)
+                Injekt.get<CrashlyticsInterface>().logException(e)
             }
             broadcastDownloadFailed(task.episode)
         }

app/src/main/java/ani/dantotsu/download/anime/OfflineAnimeFragment.kt

@@ -27,6 +27,7 @@ import androidx.fragment.app.Fragment
 import androidx.media3.common.util.UnstableApi
 import ani.dantotsu.R
 import ani.dantotsu.bottomBar
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currActivity
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadedType
@@ -44,7 +45,6 @@ import ani.dantotsu.snackString
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.textfield.TextInputLayout
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.animesource.model.SAnime
@@ -318,7 +318,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
         } catch (e: Exception) {
             logger("Error loading media.json: ${e.message}")
             logger(e.printStackTrace())
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
             null
         }
     }
@@ -374,7 +374,7 @@ class OfflineAnimeFragment : Fragment(), OfflineAnimeSearchListener {
         } catch (e: Exception) {
             logger("Error loading media.json: ${e.message}")
             logger(e.printStackTrace())
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
             return OfflineAnimeModel(
                 "unknown",
                 "0",

app/src/main/java/ani/dantotsu/download/manga/MangaDownloaderService.kt

@@ -18,6 +18,7 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.logger
@@ -29,7 +30,6 @@ import ani.dantotsu.media.manga.MangaReadFragment.Companion.ACTION_DOWNLOAD_PROG
 import ani.dantotsu.media.manga.MangaReadFragment.Companion.ACTION_DOWNLOAD_STARTED
 import ani.dantotsu.media.manga.MangaReadFragment.Companion.EXTRA_CHAPTER_NUMBER
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.data.notification.Notifications.CHANNEL_DOWNLOADER_PROGRESS
@@ -253,7 +253,7 @@ class MangaDownloaderService : Service() {
         } catch (e: Exception) {
             logger("Exception while downloading file: ${e.message}")
             snackString("Exception while downloading file: ${e.message}")
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
             broadcastDownloadFailed(task.chapter)
         }
     }
@@ -283,7 +283,7 @@ class MangaDownloaderService : Service() {
         } catch (e: Exception) {
             println("Exception while saving image: ${e.message}")
             snackString("Exception while saving image: ${e.message}")
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
         }
     }
 

app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt

@@ -24,6 +24,7 @@ import androidx.core.view.marginBottom
 import androidx.fragment.app.Fragment
 import ani.dantotsu.R
 import ani.dantotsu.bottomBar
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currActivity
 import ani.dantotsu.currContext
 import ani.dantotsu.download.DownloadedType
@@ -41,7 +42,6 @@ import ani.dantotsu.snackString
 import com.google.android.material.card.MaterialCardView
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.textfield.TextInputLayout
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.source.model.SChapter
@@ -310,7 +310,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
         } catch (e: Exception) {
             logger("Error loading media.json: ${e.message}")
             logger(e.printStackTrace())
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
             null
         }
     }
@@ -360,7 +360,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
         } catch (e: Exception) {
             logger("Error loading media.json: ${e.message}")
             logger(e.printStackTrace())
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
             return OfflineMangaModel(
                 "unknown",
                 "0",

app/src/main/java/ani/dantotsu/download/novel/NovelDownloaderService.kt

@@ -17,13 +17,13 @@ import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.content.ContextCompat
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.download.DownloadedType
 import ani.dantotsu.download.DownloadsManager
 import ani.dantotsu.logger
 import ani.dantotsu.media.Media
 import ani.dantotsu.media.novel.NovelReadFragment
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.google.gson.GsonBuilder
 import com.google.gson.InstanceCreator
 import eu.kanade.tachiyomi.data.notification.Notifications
@@ -342,7 +342,7 @@ class NovelDownloaderService : Service() {
         } catch (e: Exception) {
             logger("Exception while downloading .epub: ${e.message}")
             snackString("Exception while downloading .epub: ${e.message}")
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
             broadcastDownloadFailed(task.originalLink)
         }
     }

app/src/main/java/ani/dantotsu/home/LoginFragment.kt

@@ -32,9 +32,6 @@ class LoginFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         _binding = FragmentLoginBinding.inflate(layoutInflater, container, false)
-        val layoutParams = binding.importSettingsButton.layoutParams as ViewGroup.MarginLayoutParams
-        layoutParams.topMargin += statusBarHeight
-        binding.importSettingsButton.layoutParams = layoutParams
         return binding.root
     }
 

app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt

@@ -65,6 +65,7 @@ import androidx.mediarouter.app.MediaRouteButton
 import ani.dantotsu.*
 import ani.dantotsu.R
 import ani.dantotsu.connections.anilist.Anilist
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.connections.discord.Discord
 import ani.dantotsu.connections.discord.DiscordService
 import ani.dantotsu.connections.discord.DiscordServiceRunningSingleton
@@ -90,7 +91,6 @@ import com.google.android.gms.cast.framework.CastContext
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import com.google.android.material.slider.Slider
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.lagradost.nicehttp.ignoreAllSSLErrors
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -98,6 +98,8 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import okhttp3.internal.immutableListOf
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.util.*
 import java.util.concurrent.*
 import kotlin.math.max
@@ -1747,7 +1749,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
             else
             -> {
                 toast("Player Error ${error.errorCode} (${error.errorCodeName}) : ${error.message}")
-                FirebaseCrashlytics.getInstance().recordException(error)
+                Injekt.get<CrashlyticsInterface>().logException(error)
             }
         }
     }

app/src/main/java/ani/dantotsu/media/anime/SelectorDialogFragment.kt

@@ -17,6 +17,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.*
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.BottomSheetSelectorBinding
 import ani.dantotsu.databinding.ItemStreamBinding
 import ani.dantotsu.databinding.ItemUrlBinding
@@ -29,11 +30,12 @@ import ani.dantotsu.parsers.VideoExtractor
 import ani.dantotsu.parsers.VideoType
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.text.DecimalFormat
 
 
@@ -266,7 +268,7 @@ class SelectorDialogFragment : BottomSheetDialogFragment() {
                 media!!.anime!!.episodes!![media!!.anime!!.selectedEpisode!!]?.selectedVideo = 0
                 startExoplayer(media!!)
             } catch (e: Exception) {
-                FirebaseCrashlytics.getInstance().recordException(e)
+                Injekt.get<CrashlyticsInterface>().logException(e)
             }
         }
 

app/src/main/java/ani/dantotsu/media/manga/mangareader/MangaReaderActivity.kt

@@ -28,6 +28,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.*
 import ani.dantotsu.connections.anilist.Anilist
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.connections.discord.Discord
 import ani.dantotsu.connections.discord.DiscordService
 import ani.dantotsu.connections.discord.DiscordServiceRunningSingleton
@@ -55,9 +56,6 @@ import ani.dantotsu.themes.ThemeManager
 import com.alexvasilkov.gestures.views.GestureFrameLayout
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
 import com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import com.google.firebase.crashlytics.ktx.crashlytics
-import com.google.firebase.ktx.Firebase
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -221,7 +219,7 @@ class MangaReaderActivity : AppCompatActivity() {
                 }
                 model.mangaReadSources = mangaSources
             } catch (e: Exception) {
-                Firebase.crashlytics.recordException(e)
+                Injekt.get<CrashlyticsInterface>().logException(e)
                 logError(e)
             }
         }
@@ -924,8 +922,8 @@ class MangaReaderActivity : AppCompatActivity() {
             try {
                 a?.deleteFile(fileName)
             } catch (e: Exception) {
-                FirebaseCrashlytics.getInstance().log("Failed to delete file $fileName")
+                Injekt.get<CrashlyticsInterface>().log("Failed to delete file $fileName")
-                FirebaseCrashlytics.getInstance().recordException(e)
+                Injekt.get<CrashlyticsInterface>().logException(e)
             }
             e.printStackTrace()
         }

app/src/main/java/ani/dantotsu/media/novel/novelreader/NovelReaderActivity.kt

@@ -29,6 +29,7 @@ import androidx.webkit.WebViewCompat
 import ani.dantotsu.GesturesListener
 import ani.dantotsu.NoPaddingArrayAdapter
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currContext
 import ani.dantotsu.databinding.ActivityNovelReaderBinding
 import ani.dantotsu.hideSystemBars
@@ -42,7 +43,6 @@ import ani.dantotsu.snackString
 import ani.dantotsu.themes.ThemeManager
 import ani.dantotsu.tryWith
 import com.google.android.material.slider.Slider
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import com.vipulog.ebookreader.Book
 import com.vipulog.ebookreader.EbookReaderEventListener
 import com.vipulog.ebookreader.ReaderError
@@ -52,6 +52,8 @@ import com.vipulog.ebookreader.RelocationInfo
 import com.vipulog.ebookreader.TocItem
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
@@ -502,8 +504,8 @@ class NovelReaderActivity : AppCompatActivity(), EbookReaderEventListener {
             try {
                 a?.deleteFile(fileName)
             } catch (e: Exception) {
-                FirebaseCrashlytics.getInstance().log("Failed to delete file $fileName")
+                Injekt.get<CrashlyticsInterface>().log("Failed to delete file $fileName")
-                FirebaseCrashlytics.getInstance().recordException(e)
+                Injekt.get<CrashlyticsInterface>().logException(e)
             }
             e.printStackTrace()
         }

app/src/main/java/ani/dantotsu/others/DisabledReports.kt

@@ -1,5 +1,5 @@
 package ani.dantotsu.others
 
 const val DisabledReports = false
-//Setting this to false, will allow sending crash reports to Dantotsu's Firebase Crashlytics
+//Setting this to false, will allow sending crash reports to Dantotsu's Firebase CrashlyticsInterface
 //if you want a custom build without crash reporting, set this to true

app/src/main/java/ani/dantotsu/parsers/AniyomiAdapter.kt

@@ -714,8 +714,6 @@ class VideoServerPassthrough(val videoServer: VideoServer) : VideoExtractor() {
         // If the format is still undetermined, log an error
         if (format == null) {
             logger("Unknown video format: $videoUrl")
-            //FirebaseCrashlytics.getInstance()
-            //   .recordException(Exception("Unknown video format: $videoUrl"))
             format = VideoType.CONTAINER
         }
         val headersMap: Map<String, String> =

app/src/main/java/ani/dantotsu/parsers/novel/NovelExtensionLoader.kt

@@ -6,12 +6,14 @@ import android.content.pm.PackageManager.GET_SIGNATURES
 import android.content.pm.PackageManager.GET_SIGNING_CERTIFICATES
 import android.os.Build
 import android.util.Log
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.logger
 import ani.dantotsu.parsers.NovelInterface
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import dalvik.system.PathClassLoader
 import eu.kanade.tachiyomi.util.lang.Hash
+import uy.kohesive.injekt.Injekt
+import uy.kohesive.injekt.api.get
 import java.io.File
 import java.util.Locale
 
@@ -141,7 +143,7 @@ internal object NovelExtensionLoader {
             listOfNotNull(novelInterfaceInstance)
         } catch (e: Exception) {
             e.printStackTrace()
-            FirebaseCrashlytics.getInstance().recordException(e)
+            Injekt.get<CrashlyticsInterface>().logException(e)
             emptyList()
         }
     }

app/src/main/java/ani/dantotsu/settings/AnimeExtensionsFragment.kt

@@ -12,13 +12,13 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.FragmentAnimeExtensionsBinding
 import ani.dantotsu.settings.paging.AnimeExtensionAdapter
 import ani.dantotsu.settings.paging.AnimeExtensionsViewModel
 import ani.dantotsu.settings.paging.AnimeExtensionsViewModelFactory
 import ani.dantotsu.settings.paging.OnAnimeInstallClickListener
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
 import eu.kanade.tachiyomi.extension.anime.model.AnimeExtension
@@ -97,7 +97,7 @@ class AnimeExtensionsFragment : Fragment(),
                         notificationManager.notify(1, builder.build())
                     },
                     { error ->
-                        FirebaseCrashlytics.getInstance().recordException(error)
+                        Injekt.get<CrashlyticsInterface>().logException(error)
                         val builder = NotificationCompat.Builder(
                             context,
                             Notifications.CHANNEL_DOWNLOADER_ERROR

app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt

@@ -23,6 +23,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.FragmentAnimeExtensionsBinding
 import ani.dantotsu.logger
 import ani.dantotsu.others.LanguageMapper
@@ -33,7 +34,6 @@ import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.snackString
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.textfield.TextInputLayout
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.animesource.ConfigurableAnimeSource
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.anime.AnimeExtensionManager
@@ -145,7 +145,7 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
                                 notificationManager.notify(1, builder.build())
                             },
                             { error ->
-                                FirebaseCrashlytics.getInstance().recordException(error)
+                                Injekt.get<CrashlyticsInterface>().logException(error)
                                 Log.e("AnimeExtensionsAdapter", "Error: ", error)  // Log the error
                                 val builder = NotificationCompat.Builder(
                                     context,

app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt

@@ -24,6 +24,7 @@ import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewpager2.widget.ViewPager2
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.FragmentMangaExtensionsBinding
 import ani.dantotsu.others.LanguageMapper
 import ani.dantotsu.parsers.MangaSources
@@ -33,7 +34,6 @@ import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.snackString
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.textfield.TextInputLayout
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
@@ -142,7 +142,7 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
                                 notificationManager.notify(1, builder.build())
                             },
                             { error ->
-                                FirebaseCrashlytics.getInstance().recordException(error)
+                                Injekt.get<CrashlyticsInterface>().logException(error)
                                 Log.e("MangaExtensionsAdapter", "Error: ", error)  // Log the error
                                 val builder = NotificationCompat.Builder(
                                     context,

app/src/main/java/ani/dantotsu/settings/InstalledNovelExtensionsFragment.kt

@@ -20,6 +20,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.currContext
 import ani.dantotsu.databinding.FragmentNovelExtensionsBinding
 import ani.dantotsu.others.LanguageMapper
@@ -29,7 +30,6 @@ import ani.dantotsu.parsers.novel.NovelExtensionManager
 import ani.dantotsu.settings.saving.PrefName
 import ani.dantotsu.settings.saving.PrefManager
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.data.notification.Notifications
 import kotlinx.coroutines.launch
 import rx.android.schedulers.AndroidSchedulers
@@ -71,7 +71,7 @@ class InstalledNovelExtensionsFragment : Fragment(), SearchQueryHandler {
                                 notificationManager.notify(1, builder.build())
                             },
                             { error ->
-                                FirebaseCrashlytics.getInstance().recordException(error)
+                                Injekt.get<CrashlyticsInterface>().logException(error)
                                 Log.e("NovelExtensionsAdapter", "Error: ", error)  // Log the error
                                 val builder = NotificationCompat.Builder(
                                     context,

app/src/main/java/ani/dantotsu/settings/MangaExtensionsFragment.kt

@@ -12,13 +12,13 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.FragmentMangaExtensionsBinding
 import ani.dantotsu.settings.paging.MangaExtensionAdapter
 import ani.dantotsu.settings.paging.MangaExtensionsViewModel
 import ani.dantotsu.settings.paging.MangaExtensionsViewModelFactory
 import ani.dantotsu.settings.paging.OnMangaInstallClickListener
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.data.notification.Notifications
 import eu.kanade.tachiyomi.extension.manga.MangaExtensionManager
 import eu.kanade.tachiyomi.extension.manga.model.MangaExtension
@@ -98,7 +98,7 @@ class MangaExtensionsFragment : Fragment(),
                         notificationManager.notify(1, builder.build())
                     },
                     { error ->
-                        FirebaseCrashlytics.getInstance().recordException(error)
+                        Injekt.get<CrashlyticsInterface>().logException(error)
                         val builder = NotificationCompat.Builder(
                             context,
                             Notifications.CHANNEL_DOWNLOADER_ERROR

app/src/main/java/ani/dantotsu/settings/NovelExtensionsFragment.kt

@@ -13,6 +13,7 @@ import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import ani.dantotsu.R
+import ani.dantotsu.connections.crashlytics.CrashlyticsInterface
 import ani.dantotsu.databinding.FragmentNovelExtensionsBinding
 import ani.dantotsu.parsers.novel.NovelExtension
 import ani.dantotsu.parsers.novel.NovelExtensionManager
@@ -21,7 +22,6 @@ import ani.dantotsu.settings.paging.NovelExtensionsViewModel
 import ani.dantotsu.settings.paging.NovelExtensionsViewModelFactory
 import ani.dantotsu.settings.paging.OnNovelInstallClickListener
 import ani.dantotsu.snackString
-import com.google.firebase.crashlytics.FirebaseCrashlytics
 import eu.kanade.tachiyomi.data.notification.Notifications
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.launch
@@ -99,7 +99,7 @@ class NovelExtensionsFragment : Fragment(),
                         notificationManager.notify(1, builder.build())
                     },
                     { error ->
-                        FirebaseCrashlytics.getInstance().recordException(error)
+                        Injekt.get<CrashlyticsInterface>().logException(error)
                         val builder = NotificationCompat.Builder(
                             context,
                             Notifications.CHANNEL_DOWNLOADER_ERROR

app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt

@@ -85,7 +85,6 @@ class PlayerSettingsActivity : AppCompatActivity() {
                 2f
             )
         val cursedSpeeds = arrayOf(1f, 1.25f, 1.5f, 1.75f, 2f, 2.5f, 3f, 4f, 5f, 10f, 25f, 50f)
-        //var curSpeedArr = if (settings.cursedSpeeds) cursedSpeeds else speeds
         var curSpeedArr = if (PrefManager.getVal(PrefName.CursedSpeeds)) cursedSpeeds else speeds
         var speedsName = curSpeedArr.map { "${it}x" }.toTypedArray()
         binding.playerSettingsSpeed.text =

app/src/main/java/ani/dantotsu/settings/SettingsActivity.kt

@@ -677,18 +677,23 @@ class SettingsActivity : AppCompatActivity(), SimpleDialog.OnDialogResultListene
             }
         }
 
-        binding.settingsLogo.setOnLongClickListener {
+        if (!BuildConfig.FLAVOR.contains("fdroid")) {
-            lifecycleScope.launch(Dispatchers.IO) {
+            binding.settingsLogo.setOnLongClickListener {
-                AppUpdater.check(this@SettingsActivity, true)
+                lifecycleScope.launch(Dispatchers.IO) {
+                    AppUpdater.check(this@SettingsActivity, true)
+                }
+                true
             }
-            true
-        }
 
-        binding.settingsCheckUpdate.setOnLongClickListener {
+            binding.settingsCheckUpdate.setOnLongClickListener {
-            lifecycleScope.launch(Dispatchers.IO) {
+                lifecycleScope.launch(Dispatchers.IO) {
-                AppUpdater.check(this@SettingsActivity, true)
+                    AppUpdater.check(this@SettingsActivity, true)
+                }
+                true
             }
-            true
+        } else {
+            binding.settingsCheckUpdate.visibility = View.GONE
+            binding.settingsShareUsername.visibility = View.GONE
         }
 
         binding.settingsAccountHelp.setOnClickListener {

app/src/main/res/layout/fragment_login.xml

@@ -12,17 +12,6 @@
         android:visibility="gone"
         tools:ignore="ContentDescription" />
 
-    <Button
-        android:id="@+id/importSettingsButton"
-        android:layout_width="111dp"
-        android:layout_height="64dp"
-        android:layout_gravity="top|end"
-        android:backgroundTint="?attr/colorPrimaryContainer"
-        android:fontFamily="@font/poppins_bold"
-        android:text="@string/import_settings"
-        android:textColor="?attr/colorOnPrimaryContainer"
-        app:cornerRadius="16dp" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -51,7 +40,8 @@
             android:layout_width="156dp"
             android:layout_height="64dp"
             android:layout_gravity="bottom|center_horizontal"
-            android:layout_margin="32dp"
+            android:layout_marginTop="32dp"
+            android:layout_marginBottom="16dp"
             android:backgroundTint="?attr/colorPrimaryContainer"
             android:fontFamily="@font/poppins_bold"
             android:text="@string/login"
@@ -59,6 +49,19 @@
             app:cornerRadius="16dp"
             app:icon="@drawable/ic_anilist"
             app:iconTint="?attr/colorOnPrimaryContainer" />
+        <Button
+            android:id="@+id/importSettingsButton"
+            android:layout_width="156dp"
+            android:layout_height="64dp"
+            android:layout_gravity="bottom|center_horizontal"
+            android:layout_marginBottom="32dp"
+            android:backgroundTint="?attr/colorPrimaryContainer"
+            android:fontFamily="@font/poppins_bold"
+            android:text="@string/import_settings"
+            app:icon="@drawable/ic_download_24"
+            app:iconTint="?attr/colorOnPrimaryContainer"
+            android:textColor="?attr/colorOnPrimaryContainer"
+            app:cornerRadius="16dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"

build.gradle

@@ -12,9 +12,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
-        classpath 'com.google.gms:google-services:4.4.0'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
         classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version"

gradle.properties

@@ -15,7 +15,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
 android.nonFinalResIds=true
 org.gradle.unsafe.configuration-cache=true