diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2f0a06d..f1e4c8d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
T.slotId: Int where T: Fragment, T: EuiccFragmentMarker
get() = requireArguments().getInt("slotId")
val T.euiccChannelManager: EuiccChannelManager where T: Fragment, T: EuiccFragmentMarker
- get() = (requireActivity().application as OpenEUICCApplication).euiccChannelManager
+ get() = openEuiccApplication.euiccChannelManager
val T.channel: EuiccChannel where T: Fragment, T: EuiccFragmentMarker
get() =
diff --git a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
index 503fac4..94598ea 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
+++ b/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
@@ -12,11 +12,11 @@ import android.widget.Spinner
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
-import im.angry.openeuicc.OpenEUICCApplication
import im.angry.openeuicc.R
import im.angry.openeuicc.core.EuiccChannelManager
import im.angry.openeuicc.databinding.ActivityMainBinding
import im.angry.openeuicc.util.dsdsEnabled
+import im.angry.openeuicc.util.openEuiccApplication
import im.angry.openeuicc.util.supportsDSDS
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -43,9 +43,9 @@ class MainActivity : AppCompatActivity() {
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
- tm = getSystemService(TelephonyManager::class.java)
+ tm = openEuiccApplication.telephonyManager
- manager = (application as OpenEUICCApplication).euiccChannelManager
+ manager = openEuiccApplication.euiccChannelManager
spinnerAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item)
diff --git a/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt b/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt
index 24c1ad8..477837f 100644
--- a/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt
+++ b/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt
@@ -1,9 +1,18 @@
package im.angry.openeuicc.util
+import android.app.Activity
import android.content.res.Resources
import android.graphics.Rect
import android.view.ViewGroup
import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.Fragment
+import im.angry.openeuicc.OpenEuiccApplication
+
+val Activity.openEuiccApplication: OpenEuiccApplication
+ get() = application as OpenEuiccApplication
+
+val Fragment.openEuiccApplication: OpenEuiccApplication
+ get() = requireActivity().openEuiccApplication
// Source:
/**