chore: remove App.getInstance() used globally

api/src/main/java/com/getcode/manager/GiftCardManager.kt

@@ -0,0 +1,19 @@
+package com.getcode.manager
+
+import android.content.Context
+import com.getcode.crypt.MnemonicPhrase
+import com.getcode.solana.organizer.GiftCardAccount
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class GiftCardManager @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    fun createGiftCard(mnemonic: MnemonicPhrase? = null): GiftCardAccount {
+        return GiftCardAccount.newInstance(context, mnemonic)
+    }
+
+    fun getEntropy(giftCard: GiftCardAccount): String {
+        return giftCard.mnemonicPhrase.getBase58EncodedEntropy(context)
+    }
+}

api/src/main/java/com/getcode/manager/MnemonicManager.kt

@@ -0,0 +1,34 @@
+package com.getcode.manager
+
+import android.content.Context
+import com.getcode.crypt.MnemonicCode
+import com.getcode.crypt.MnemonicPhrase
+import com.getcode.ed25519.Ed25519.KeyPair
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class MnemonicManager @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    fun fromCashLink(cashLink: String): MnemonicPhrase {
+        return MnemonicPhrase.fromEntropyB58(context, cashLink)
+    }
+
+    fun fromEntropyBase64(entropy: String): MnemonicPhrase {
+        return MnemonicPhrase.fromEntropyB64(context, entropy)
+    }
+
+    fun getKeyPair(entropy: String): KeyPair {
+        return fromEntropyBase64(entropy).getSolanaKeyPair(context)
+    }
+
+    fun getKeyPair(mnemonicPhrase: MnemonicPhrase): KeyPair {
+        return mnemonicPhrase.getSolanaKeyPair(context)
+    }
+
+    fun getEncodedBase64(mnemonicPhrase: MnemonicPhrase): String {
+        return mnemonicPhrase.getBase64EncodedEntropy(context)
+    }
+
+    val mnemonicCode: MnemonicCode = context.resources.let(::MnemonicCode)
+}

api/src/main/java/com/getcode/media/MediaScanner.kt

@@ -0,0 +1,15 @@
+package com.getcode.media
+
+import android.content.Context
+import android.media.MediaScannerConnection
+import dagger.hilt.android.qualifiers.ApplicationContext
+import java.io.File
+import javax.inject.Inject
+
+class MediaScanner @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    fun scan(directory: File) {
+        MediaScannerConnection.scanFile(context, arrayOf(directory.toString()), null, null)
+    }
+}

app/src/main/java/com/getcode/App.kt

@@ -22,7 +22,6 @@ class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        instance = this
 
         CashBillAssets.load(this)
 
@@ -63,13 +62,4 @@ class App : Application() {
             Bugsnag.start(this)
         }
     }
-
-    companion object {
-        private lateinit var instance: Application
-
-        @Deprecated(message = "Anti-pattern; inject @ApplicationContext where needed. Convert objects to classes.")
-        fun getInstance(): Application {
-            return instance
-        }
-    }
 }

app/src/main/java/com/getcode/util/AccountUtils.kt

@@ -78,7 +78,7 @@ object AccountUtils {
         val subject = SingleSubject.create<Pair<String?, Account?>>()
         return subject.doOnSubscribe {
             CoroutineScope(Dispatchers.IO).launch {
-                val result = getAccountNoActivity(App.getInstance())
+                val result = getAccountNoActivity(context)
                 subject.onSuccess(result ?: (null to null))
             }
         }

app/src/main/java/com/getcode/util/Context.kt

@@ -0,0 +1,31 @@
+package com.getcode.util
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import androidx.core.content.ContextCompat
+import com.getcode.BuildConfig
+import com.getcode.utils.makeE164
+
+fun Context.launchAppSettings() {
+    ContextCompat.startActivity(
+        this,
+        Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            data = Uri.fromParts("package", BuildConfig.APPLICATION_ID, null)
+            flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        },
+        null
+    )
+}
+
+fun Context.launchSmsIntent(phoneValue: String, message: String) {
+    val uri: Uri = Uri.parse("smsto:${phoneValue.makeE164()}")
+    val intent = Intent(Intent.ACTION_SENDTO, uri)
+    intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+    intent.putExtra(
+        "sms_body",
+        message
+    )
+    ContextCompat.startActivity(this, intent, null)
+}

app/src/main/java/com/getcode/util/IntentLauncher.kt

@@ -0,0 +1,17 @@
+package com.getcode.util
+
+import android.content.Context
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
+
+class IntentLauncher @Inject constructor(
+    @ApplicationContext private val context: Context
+) {
+    fun launchAppSettings() {
+        context.launchAppSettings()
+    }
+
+    fun launchSmsIntent(phoneValue: String, message: String) {
+        context.launchSmsIntent(phoneValue, message)
+    }
+}

app/src/main/java/com/getcode/view/login/AccessKey.kt

@@ -54,7 +54,6 @@ import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.screens.LoginArgs
 import com.getcode.theme.CodeTheme
 import com.getcode.theme.White
-import com.getcode.util.IntentUtils
 import com.getcode.ui.utils.measured
 import com.getcode.ui.components.AccessKeySelectionContainer
 import com.getcode.ui.components.ButtonState
@@ -65,6 +64,7 @@ import com.getcode.ui.components.getPermissionLauncher
 import com.getcode.ui.components.rememberSelectionState
 import com.getcode.ui.utils.addIf
 import com.getcode.ui.utils.debugBounds
+import com.getcode.util.launchAppSettings
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Preview
@@ -93,7 +93,7 @@ fun AccessKey(
                     message = context.getString(R.string.error_description_failedToSave),
                     type = TopBarManager.TopBarMessageType.ERROR,
                     secondaryText = context.getString(R.string.action_openSettings),
-                    secondaryAction = { IntentUtils.launchAppSettings() }
+                    secondaryAction = { context.launchAppSettings() }
                 )
             )
         }

app/src/main/java/com/getcode/view/login/AccessKeyViewModel.kt

@@ -3,33 +3,35 @@ package com.getcode.view.login
 import android.Manifest
 import android.annotation.SuppressLint
 import android.os.Build
-import dagger.hilt.android.lifecycle.HiltViewModel
-import com.getcode.App
-import com.getcode.crypt.MnemonicPhrase
 import com.getcode.analytics.AnalyticsService
 import com.getcode.manager.AuthManager
-import com.getcode.navigation.screens.CodeLoginPermission
+import com.getcode.media.MediaScanner
+import com.getcode.manager.MnemonicManager
 import com.getcode.navigation.core.CodeNavigator
+import com.getcode.navigation.screens.CodeLoginPermission
 import com.getcode.navigation.screens.HomeScreen
 import com.getcode.navigation.screens.LoginScreen
 import com.getcode.navigation.screens.PermissionRequestScreen
 import com.getcode.network.repository.getPublicKeyBase58
 import com.getcode.util.permissions.PermissionChecker
 import com.getcode.util.resources.ResourceHelper
-import javax.inject.Inject
+import dagger.hilt.android.lifecycle.HiltViewModel
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.schedulers.Schedulers
 import java.util.concurrent.TimeUnit
+import javax.inject.Inject
 
 
 @HiltViewModel
 class AccessKeyViewModel @Inject constructor(
     private val authManager: AuthManager,
     private val analytics: AnalyticsService,
     private val permissions: PermissionChecker,
+    private val mnemonicManager: MnemonicManager,
     resources: ResourceHelper,
-) : BaseAccessKeyViewModel(resources) {
+    mediaScanner: MediaScanner,
+) : BaseAccessKeyViewModel(resources, mnemonicManager, mediaScanner) {
     @SuppressLint("CheckResult")
     fun onSubmit(navigator: CodeNavigator, isSaveImage: Boolean, isDeepLink: Boolean = false) {
         val entropyB64 = uiFlow.value.entropyB64 ?: return
@@ -69,8 +71,7 @@ class AccessKeyViewModel @Inject constructor(
     }
 
     private fun onComplete(navigator: CodeNavigator, entropyB64: String) {
-        val owner = MnemonicPhrase.fromEntropyB64(App.getInstance(), entropyB64)
-            .getSolanaKeyPair(App.getInstance())
+        val owner = mnemonicManager.getKeyPair(entropyB64)
         analytics.createAccount(true, owner.getPublicKeyBase58())
 
         val cameraPermissionDenied = permissions.isDenied(Manifest.permission.CAMERA)

app/src/main/java/com/getcode/view/login/BaseAccessKeyViewModel.kt

@@ -4,21 +4,22 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
 import android.graphics.Typeface
-import android.media.MediaScannerConnection
 import android.os.Environment
 import androidmads.library.qrgenearator.QRGContents
 import androidmads.library.qrgenearator.QRGEncoder
 import androidx.core.graphics.applyCanvas
 import androidx.core.graphics.drawable.toBitmap
 import androidx.lifecycle.viewModelScope
-import com.getcode.App
 import com.getcode.R
-import com.getcode.crypt.MnemonicPhrase
+import com.getcode.media.MediaScanner
+import com.getcode.manager.MnemonicManager
 import com.getcode.manager.SessionManager
 import com.getcode.manager.TopBarManager
 import com.getcode.network.repository.ApiDeniedException
 import com.getcode.network.repository.decodeBase64
-import com.getcode.theme.*
+import com.getcode.theme.Brand
+import com.getcode.theme.Transparent
+import com.getcode.theme.White
 import com.getcode.ui.utils.toAGColor
 import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.ErrorUtils
@@ -34,7 +35,8 @@ import java.io.File
 import java.io.FileOutputStream
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 
 data class AccessKeyUiModel(
@@ -48,8 +50,11 @@ data class AccessKeyUiModel(
     val accessKeyCroppedBitmap: Bitmap? = null,
 )
 
-abstract class BaseAccessKeyViewModel(private val resources: ResourceHelper) :
-    BaseViewModel(resources) {
+abstract class BaseAccessKeyViewModel(
+    private val resources: ResourceHelper,
+    private val mnemonicManager: MnemonicManager,
+    private val mediaScanner: MediaScanner,
+) : BaseViewModel(resources) {
     val uiFlow = MutableStateFlow(AccessKeyUiModel())
 
     fun init() {
@@ -63,7 +68,7 @@ abstract class BaseAccessKeyViewModel(private val resources: ResourceHelper) :
     fun initWithEntropy(entropyB64: String) {
         if (uiFlow.value.entropyB64 == entropyB64) return
         Timber.d("entropy=$entropyB64")
-        val words = MnemonicPhrase.fromEntropyB64(App.getInstance(), entropyB64).words
+        val words = mnemonicManager.fromEntropyBase64(entropyB64).words
         val wordsFormatted = getAccessKeyText(words).joinToString("\n")
 
         uiFlow.value = uiFlow.value.copy(
@@ -74,8 +79,10 @@ abstract class BaseAccessKeyViewModel(private val resources: ResourceHelper) :
 
         CoroutineScope(Dispatchers.IO).launch {
             val accessKeyBitmap = createBitmapForExport(words = words, entropyB64 = entropyB64)
-            val accessKeyBitmapDisplay = createBitmapForExport(drawBackground = false, words, entropyB64)
-            val accessKeyCroppedBitmap = Bitmap.createBitmap(accessKeyBitmapDisplay, 0, 300, 1200, 1450)
+            val accessKeyBitmapDisplay =
+                createBitmapForExport(drawBackground = false, words, entropyB64)
+            val accessKeyCroppedBitmap =
+                Bitmap.createBitmap(accessKeyBitmapDisplay, 0, 300, 1200, 1450)
 
             uiFlow.value = uiFlow.value.copy(
                 accessKeyBitmap = accessKeyBitmap,
@@ -123,7 +130,7 @@ abstract class BaseAccessKeyViewModel(private val resources: ResourceHelper) :
             ErrorUtils.handleError(e)
             return false
         }
-        MediaScannerConnection.scanFile(App.getInstance(), arrayOf(sd.toString()), null, null)
+        mediaScanner.scan(sd)
         return true
     }
 

app/src/main/java/com/getcode/view/login/CameraPermissionCheck.kt

@@ -6,9 +6,9 @@ import androidx.compose.ui.platform.LocalContext
 import com.getcode.App
 import com.getcode.R
 import com.getcode.manager.TopBarManager
-import com.getcode.util.IntentUtils
 import com.getcode.ui.components.PermissionCheck
 import com.getcode.ui.components.getPermissionLauncher
+import com.getcode.util.launchAppSettings
 
 @Composable
 fun cameraPermissionCheck(isShowError: Boolean = true, onResult: (Boolean) -> Unit): (Boolean) -> Unit {
@@ -21,7 +21,7 @@ fun cameraPermissionCheck(isShowError: Boolean = true, onResult: (Boolean) -> Un
                 message = context.getString(R.string.error_description_cameraAccessRequired),
                 type = TopBarManager.TopBarMessageType.ERROR,
                 secondaryText = context.getString(R.string.action_openSettings),
-                secondaryAction = { IntentUtils.launchAppSettings() }
+                secondaryAction = { context.launchAppSettings() }
             )
         )
     }

app/src/main/java/com/getcode/view/login/NotificationPermissionCheck.kt

@@ -7,9 +7,9 @@ import androidx.compose.ui.platform.LocalContext
 import com.getcode.App
 import com.getcode.R
 import com.getcode.manager.TopBarManager
-import com.getcode.util.IntentUtils
 import com.getcode.ui.components.PermissionCheck
 import com.getcode.ui.components.getPermissionLauncher
+import com.getcode.util.launchAppSettings
 
 @Composable
 fun notificationPermissionCheck(isShowError: Boolean = true, onResult: (Boolean) -> Unit): (Boolean) -> Unit {
@@ -22,7 +22,7 @@ fun notificationPermissionCheck(isShowError: Boolean = true, onResult: (Boolean)
                 message = context.getString(R.string.permissions_description_push),
                 type = TopBarManager.TopBarMessageType.ERROR,
                 secondaryText = context.getString(R.string.action_openSettings),
-                secondaryAction = { IntentUtils.launchAppSettings() }
+                secondaryAction = { context.launchAppSettings() }
             )
         )
     }