Skip to content

Commit ca127ff

Browse files
committed
Fix: Remove Firebase/Timber from App.kt, simplify AppSyncWorker (no HiltWorker)
1 parent b947f15 commit ca127ff

File tree

2 files changed

+18
-63
lines changed

2 files changed

+18
-63
lines changed
Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,19 @@
11
package com.appcontrolx
22

33
import android.app.Application
4+
import android.util.Log
45
import androidx.appcompat.app.AppCompatDelegate
5-
import androidx.hilt.work.HiltWorkerFactory
66
import androidx.preference.PreferenceManager
7-
import androidx.work.Configuration
87
import com.appcontrolx.utils.Constants
9-
import com.google.firebase.crashlytics.FirebaseCrashlytics
108
import com.topjohnwu.superuser.Shell
119
import dagger.hilt.android.HiltAndroidApp
12-
import timber.log.Timber
13-
import javax.inject.Inject
1410

1511
@HiltAndroidApp
16-
class App : Application(), Configuration.Provider {
17-
18-
@Inject
19-
lateinit var workerFactory: HiltWorkerFactory
12+
class App : Application() {
2013

2114
companion object {
15+
private const val TAG = "AppControlX"
16+
2217
init {
2318
Shell.enableVerboseLogging = BuildConfig.DEBUG
2419
Shell.setDefaultBuilder(
@@ -31,50 +26,13 @@ class App : Application(), Configuration.Provider {
3126

3227
override fun onCreate() {
3328
super.onCreate()
34-
initTimber()
35-
initCrashlytics()
3629
applyTheme()
37-
}
38-
39-
private fun initTimber() {
40-
if (BuildConfig.DEBUG) {
41-
Timber.plant(Timber.DebugTree())
42-
} else {
43-
Timber.plant(CrashlyticsTree())
44-
}
45-
Timber.d("App initialized")
46-
}
47-
48-
private fun initCrashlytics() {
49-
FirebaseCrashlytics.getInstance().apply {
50-
setCrashlyticsCollectionEnabled(!BuildConfig.DEBUG)
51-
setCustomKey("app_version", BuildConfig.VERSION_NAME)
52-
setCustomKey("version_code", BuildConfig.VERSION_CODE)
53-
}
30+
Log.d(TAG, "App initialized")
5431
}
5532

5633
private fun applyTheme() {
5734
val prefs = PreferenceManager.getDefaultSharedPreferences(this)
5835
val theme = prefs.getInt(Constants.PREFS_THEME, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
5936
AppCompatDelegate.setDefaultNightMode(theme)
6037
}
61-
62-
override val workManagerConfiguration: Configuration
63-
get() = Configuration.Builder()
64-
.setWorkerFactory(workerFactory)
65-
.build()
66-
67-
/**
68-
* Custom Timber tree that logs to Crashlytics in production
69-
*/
70-
private class CrashlyticsTree : Timber.Tree() {
71-
override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
72-
if (priority == android.util.Log.ERROR || priority == android.util.Log.WARN) {
73-
FirebaseCrashlytics.getInstance().apply {
74-
log("$tag: $message")
75-
t?.let { recordException(it) }
76-
}
77-
}
78-
}
79-
}
8038
}
Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,30 @@
11
package com.appcontrolx.worker
22

33
import android.content.Context
4-
import androidx.hilt.work.HiltWorker
4+
import android.util.Log
55
import androidx.work.CoroutineWorker
66
import androidx.work.WorkerParameters
7-
import com.appcontrolx.data.repository.AppRepository
8-
import dagger.assisted.Assisted
9-
import dagger.assisted.AssistedInject
10-
import kotlinx.coroutines.flow.first
11-
import timber.log.Timber
7+
import com.appcontrolx.service.AppFetcher
128

13-
@HiltWorker
14-
class AppSyncWorker @AssistedInject constructor(
15-
@Assisted context: Context,
16-
@Assisted params: WorkerParameters,
17-
private val repository: AppRepository
9+
class AppSyncWorker(
10+
context: Context,
11+
params: WorkerParameters
1812
) : CoroutineWorker(context, params) {
1913

14+
private val appFetcher = AppFetcher(context)
15+
2016
override suspend fun doWork(): Result {
2117
return try {
22-
Timber.d("Starting app sync worker")
18+
Log.d(TAG, "Starting app sync worker")
2319

2420
// Pre-fetch apps to cache
25-
repository.getUserApps().first()
26-
repository.getSystemApps().first()
21+
appFetcher.getUserApps()
22+
appFetcher.getSystemApps()
2723

28-
Timber.d("App sync completed successfully")
24+
Log.d(TAG, "App sync completed successfully")
2925
Result.success()
3026
} catch (e: Exception) {
31-
Timber.e(e, "App sync failed")
27+
Log.e(TAG, "App sync failed", e)
3228
if (runAttemptCount < 3) {
3329
Result.retry()
3430
} else {
@@ -38,6 +34,7 @@ class AppSyncWorker @AssistedInject constructor(
3834
}
3935

4036
companion object {
37+
private const val TAG = "AppSyncWorker"
4138
const val WORK_NAME = "app_sync_worker"
4239
}
4340
}

0 commit comments

Comments
 (0)