refactor: rename pre-existing 'appContext' members to avoid shadowing

Author: criticalAY

AnkiDroid/src/main/java/com/ichi2/anki/analytics/AnkiDroidUsageAnalytics.kt

@@ -53,10 +53,10 @@ object AnkiDroidUsageAnalytics {
      * be uninitialized in rare Android scenarios (e.g. BackupManager) and
      * analytics is a startup concern that must not crash.
      */
-    private lateinit var appContext: Context
+    private lateinit var analyticsContext: Context
 
     private val serviceScope = CoroutineScope(Dispatchers.IO + SupervisorJob())
-    private val clientId: String by lazy { getOrCreateClientId(appContext) }
+    private val clientId: String by lazy { getOrCreateClientId(analyticsContext) }
 
     private val sharedPrefsListener =
         SharedPreferences.OnSharedPreferenceChangeListener { prefs, key ->
@@ -87,28 +87,28 @@ object AnkiDroidUsageAnalytics {
         private set
 
     fun initialize(context: Context) {
-        appContext = context.applicationContext
+        analyticsContext = context.applicationContext
 
         Timber.i("AnkiDroidUsageAnalytics:: initialize()")
 
         // Read opt-in before building the client so `enabled` reflects the
         // user's choice rather than the default.
-        handlePreferences(appContext)
+        handlePreferences(analyticsContext)
 
         if (analytics == null) {
             analytics =
                 GoogleAnalytics.builder {
-                    measurementId = appContext.getString(R.string.ga_trackingId)
+                    measurementId = analyticsContext.getString(R.string.ga_trackingId)
                     apiSecret = BuildConfig.ANALYTICS_API_KEY
-                    appName = appContext.getString(R.string.app_name)
+                    appName = analyticsContext.getString(R.string.app_name)
                     appVersion = BuildConfig.VERSION_NAME
                     enabled = optIn
-                    samplePercentage = getAnalyticsSamplePercentage(appContext)
+                    samplePercentage = getAnalyticsSamplePercentage(analyticsContext)
                     debug = false
                 }
         }
 
-        initializePrefKeys(appContext)
+        initializePrefKeys(analyticsContext)
 
         AnalyticsExceptionHandler.install(this::sendAnalyticsException)
     }
@@ -228,8 +228,8 @@ object AnkiDroidUsageAnalytics {
             }
             // Rebuild the underlying client so its own `enabled` flag picks
             // up the new opt-in state without waiting for the next launch.
-            if (::appContext.isInitialized) {
-                reinitialize(appContext)
+            if (::analyticsContext.isInitialized) {
+                reinitialize(analyticsContext)
             }
         }
 

AnkiDroid/src/main/java/com/ichi2/anki/multiprofile/ProfileManager.kt

@@ -43,7 +43,7 @@ import java.io.File
 class ProfileManager private constructor(
     context: Context,
 ) {
-    private val appContext = context.applicationContext
+    private val profileContext = context.applicationContext
 
     lateinit var activeProfileContext: Context
         private set
@@ -53,7 +53,7 @@ class ProfileManager private constructor(
      * ID of the currently active profile.
      */
     private val globalProfilePrefs by lazy {
-        appContext.getSharedPreferences(PROFILE_REGISTRY_FILENAME, Context.MODE_PRIVATE)
+        profileContext.getSharedPreferences(PROFILE_REGISTRY_FILENAME, Context.MODE_PRIVATE)
     }
 
     private val profileRegistry by lazy { ProfileRegistry(globalProfilePrefs) }
@@ -171,7 +171,7 @@ class ProfileManager private constructor(
         try {
             val wrapper =
                 ProfileContextWrapper.create(
-                    context = appContext,
+                    context = profileContext,
                     profileId = profileId,
                     profileBaseDir = profileBaseDir.file,
                 )
@@ -208,7 +208,7 @@ class ProfileManager private constructor(
         if (prefs.getString(PREF_COLLECTION_PATH, null) != null) return
 
         val profileCollectionDir =
-            getDefaultAnkiDroidDirectory(appContext, directoryName = profileId.value).apply { mkdirs() }
+            getDefaultAnkiDroidDirectory(profileContext, directoryName = profileId.value).apply { mkdirs() }
 
         prefs.edit { putString(PREF_COLLECTION_PATH, profileCollectionDir.absolutePath) }
     }
@@ -243,8 +243,8 @@ class ProfileManager private constructor(
      */
     private fun resolveProfileDirectory(profileId: ProfileId): ProfileRestrictedDirectory {
         val appDataRoot =
-            ContextCompat.getDataDir(appContext)
-                ?: appContext.filesDir.parentFile
+            ContextCompat.getDataDir(profileContext)
+                ?: profileContext.filesDir.parentFile
 
         if (appDataRoot == null) {
             val e = IllegalStateException("Cannot resolve Application Data Directory")
@@ -333,7 +333,7 @@ class ProfileManager private constructor(
 
         Timber.i("deleteProfile: starting deletion of %s", profileId)
 
-        val appDataRoot = ContextCompat.getDataDir(appContext)
+        val appDataRoot = ContextCompat.getDataDir(profileContext)
 
         if (profileId.isDefault()) {
             Timber.d("deleteProfile: wiping legacy default-profile data under %s", appDataRoot)
@@ -405,13 +405,13 @@ class ProfileManager private constructor(
      * The default-location fallback used when the profile has never written `PREF_COLLECTION_PATH`.
      *
      * TODO: consolidate with the profile-creation path this should delegate to
-     * `CollectionHelper.getDefaultAnkiDroidDirectory(appContext, directoryName = ...)`
+     * `CollectionHelper.getDefaultAnkiDroidDirectory(profileContext, directoryName = ...)`
      * that gives us legacy-storage handling and `SystemStorageException`-on-null for free, and keeps
      * the "where does a profile collection live" decision in a single place shared with
      * `ensureProfileCollectionPath`.
      */
     private fun defaultCollectionDirFor(profileId: ProfileId): File? {
-        val externalFilesDir = appContext.getExternalFilesDir(null) ?: return null
+        val externalFilesDir = profileContext.getExternalFilesDir(null) ?: return null
         return if (profileId.isDefault()) {
             File(externalFilesDir, "AnkiDroid")
         } else {
@@ -430,10 +430,10 @@ class ProfileManager private constructor(
      * TODO: extract a `ProfilePreferences` accessor (e.g. `prefsForProfile(profileId).collectionPath`)
      */
     private fun readStoredCollectionPath(profileId: ProfileId): String? {
-        val defaultPrefsName = "${appContext.packageName}_preferences"
+        val defaultPrefsName = "${profileContext.packageName}_preferences"
         val prefsName =
             if (profileId.isDefault()) defaultPrefsName else "profile_${profileId.value}_$defaultPrefsName"
-        return appContext
+        return profileContext
             .getSharedPreferences(prefsName, Context.MODE_PRIVATE)
             .getString(PREF_COLLECTION_PATH, null)
     }

AnkiDroid/src/main/java/com/ichi2/anki/navigation/AnkiDroidNavigator.kt

@@ -12,15 +12,15 @@ import com.ichi2.anki.common.destinations.Navigator
 
 /** AnkiDroid's [Navigator] implementation. */
 object AnkiDroidNavigator : Navigator {
-    private lateinit var appContext: Context
+    private lateinit var navContext: Context
 
     fun initialize(application: Application) {
-        appContext = application
+        navContext = application
     }
 
     override fun toIntent(destination: Destination): Intent =
         when (destination) {
-            is BrowserDestination -> destination.toIntent(appContext)
+            is BrowserDestination -> destination.toIntent(navContext)
         }
 }
 

AnkiDroid/src/main/java/com/ichi2/anki/reviewreminders/ReminderTroubleshootingFragment.kt

@@ -158,14 +158,12 @@ class ReminderTroubleshootingFragment : Fragment(R.layout.fragment_reminder_trou
  * [ScheduleRemindersFragment] and [ReminderTroubleshootingFragment] use this with
  * `by activityViewModels { … }` so they observe a single VM + repository instance.
  */
-internal fun reminderTroubleshootingViewModelFactory(context: Context): ViewModelProvider.Factory {
-    val appContext = context.applicationContext
-    return viewModelFactory {
+internal fun reminderTroubleshootingViewModelFactory(context: Context): ViewModelProvider.Factory =
+    viewModelFactory {
         initializer {
-            ReminderTroubleshootingViewModel(ReminderTroubleshootingRepository(appContext))
+            ReminderTroubleshootingViewModel(ReminderTroubleshootingRepository(context))
         }
     }
-}
 
 private class TroubleshootingChecksAdapter(
     private val getResolveAction: (TroubleshootingCheck) -> ResolveCheckAction?,