fix: Name clash with OpenEuiccContextMarker::context

we can just define them internally

.idea/codeStyles/Project.xml

@@ -0,0 +1,117 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>

app-common/src/main/java/im/angry/openeuicc/ui/DirectProfileDownloadActivity.kt

@@ -8,27 +8,27 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class DirectProfileDownloadActivity : AppCompatActivity(), SlotSelectFragment.SlotSelectedListener {
+class DirectProfileDownloadActivity : AppCompatActivity(), SlotSelectFragment.SlotSelectedListener, OpenEuiccContextMarker {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         lifecycleScope.launch {
             withContext(Dispatchers.IO) {
-                openEuiccApplication.euiccChannelManager.enumerateEuiccChannels()
+                euiccChannelManager.enumerateEuiccChannels()
             }
 
-            val knownChannels = openEuiccApplication.euiccChannelManager.knownChannels
             when {
-                knownChannels.isEmpty() -> {
+                euiccChannelManager.knownChannels.isEmpty() -> {
                     finish()
                 }
-                knownChannels.hasMultipleChips -> {
+                euiccChannelManager.knownChannels.hasMultipleChips -> {
                     SlotSelectFragment.newInstance()
                         .show(supportFragmentManager, SlotSelectFragment.TAG)
                 }
                 else -> {
                     // If the device has only one eSIM "chip" (but may be mapped to multiple slots),
                     // we can skip the slot selection dialog since there is only one chip to save to.
-                    onSlotSelected(knownChannels[0].slotId, knownChannels[0].portId)
+                    onSlotSelected(euiccChannelManager.knownChannels[0].slotId,
+                        euiccChannelManager.knownChannels[0].portId)
                 }
             }
         }

app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt

@@ -31,7 +31,8 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.lang.Exception
 
-open class EuiccManagementFragment : Fragment(), EuiccFragmentMarker, EuiccProfilesChangedListener {
+open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
+    EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "EuiccManagementFragment"
 

app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt

@@ -20,7 +20,7 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-open class MainActivity : AppCompatActivity() {
+open class MainActivity : AppCompatActivity(), OpenEuiccContextMarker {
     companion object {
         const val TAG = "MainActivity"
     }
@@ -43,9 +43,9 @@ open class MainActivity : AppCompatActivity() {
 
         noEuiccPlaceholder = findViewById(R.id.no_euicc_placeholder)
 
-        tm = openEuiccApplication.telephonyManager
+        tm = telephonyManager
 
-        manager = openEuiccApplication.euiccChannelManager
+        manager = euiccChannelManager
 
         spinnerAdapter = ArrayAdapter<String>(this, R.layout.spinner_item)
 

app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt

@@ -19,16 +19,15 @@ import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-import im.angry.openeuicc.OpenEuiccApplication
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.util.displayName
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.LocalProfileNotification
 
-class NotificationsActivity: AppCompatActivity() {
+class NotificationsActivity: AppCompatActivity(), OpenEuiccContextMarker {
     private lateinit var swipeRefresh: SwipeRefreshLayout
     private lateinit var notificationList: RecyclerView
     private val notificationAdapter = NotificationAdapter()
@@ -41,7 +40,7 @@ class NotificationsActivity: AppCompatActivity() {
         setSupportActionBar(findViewById(R.id.toolbar))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
-        euiccChannel = (application as OpenEuiccApplication).euiccChannelManager
+        euiccChannel = euiccChannelManager
             .findEuiccChannelBySlotBlocking(intent.getIntExtra("logicalSlotId", 0))!!
 
         swipeRefresh = findViewById(R.id.swipe_refresh)

app-common/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt

@@ -7,15 +7,12 @@ import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.preferenceRepository
+import im.angry.openeuicc.util.*
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import net.typeblog.lpac_jni.LocalProfileNotification
 import java.lang.Exception
 
-class ProfileDeleteFragment : DialogFragment(), EuiccFragmentMarker {
+class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "ProfileDeleteFragment"
 

app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt

@@ -17,9 +17,7 @@ import com.google.android.material.textfield.TextInputLayout
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.openEuiccApplication
+import im.angry.openeuicc.util.*
-import im.angry.openeuicc.util.preferenceRepository
-import im.angry.openeuicc.util.setWidthPercent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
@@ -27,7 +25,8 @@ import kotlinx.coroutines.withContext
 import net.typeblog.lpac_jni.ProfileDownloadCallback
 import kotlin.Exception
 
-class ProfileDownloadFragment : BaseMaterialDialogFragment(), EuiccFragmentMarker, Toolbar.OnMenuItemClickListener {
+class ProfileDownloadFragment : BaseMaterialDialogFragment(),
+    Toolbar.OnMenuItemClickListener, EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "ProfileDownloadFragment"
 

app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt

@@ -6,21 +6,20 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.Window
 import android.widget.ProgressBar
 import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.setWidthPercent
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.lang.Exception
 import java.lang.RuntimeException
 
-class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccFragmentMarker {
+class ProfileRenameFragment : BaseMaterialDialogFragment(), EuiccChannelFragmentMarker {
     companion object {
         const val TAG = "ProfileRenameFragment"
 

app-common/src/main/java/im/angry/openeuicc/ui/SlotSelectFragment.kt

@@ -10,10 +10,9 @@ import android.widget.Spinner
 import androidx.appcompat.widget.Toolbar
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.util.openEuiccApplication
+import im.angry.openeuicc.util.*
-import im.angry.openeuicc.util.setWidthPercent
 
-class SlotSelectFragment : BaseMaterialDialogFragment() {
+class SlotSelectFragment : BaseMaterialDialogFragment(), OpenEuiccContextMarker {
     companion object {
         const val TAG = "SlotSelectFragment"
 
@@ -30,7 +29,7 @@ class SlotSelectFragment : BaseMaterialDialogFragment() {
     private lateinit var toolbar: Toolbar
     private lateinit var spinner: Spinner
     private val channels: List<EuiccChannel> by lazy {
-        openEuiccApplication.euiccChannelManager.knownChannels.sortedBy { it.logicalSlotId }
+        euiccChannelManager.knownChannels.sortedBy { it.logicalSlotId }
     }
 
     override fun onCreateView(

app-common/src/main/java/im/angry/openeuicc/util/EuiccChannelFragmentUtils.kt

@@ -1,14 +1,15 @@
-package im.angry.openeuicc.ui
+package im.angry.openeuicc.util
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.util.openEuiccApplication
 
-interface EuiccFragmentMarker
+interface EuiccChannelFragmentMarker: OpenEuiccContextMarker
 
-fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments: Bundle.() -> Unit = {}): T where T: Fragment, T: EuiccFragmentMarker {
+// We must use extension functions because there is no way to add bounds to the type of "self"
+// in the definition of an interface, so the only way is to limit where the extension functions
+// can be applied.
+fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments: Bundle.() -> Unit = {}): T where T: Fragment, T: EuiccChannelFragmentMarker {
     val instance = clazz.newInstance()
     instance.arguments = Bundle().apply {
         putInt("slotId", slotId)
@@ -18,15 +19,12 @@ fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int, portId: Int, addArguments
     return instance
 }
 
-val <T> T.slotId: Int where T: Fragment, T: EuiccFragmentMarker
+val <T> T.slotId: Int where T: Fragment, T: EuiccChannelFragmentMarker
     get() = requireArguments().getInt("slotId")
-val <T> T.portId: Int where T: Fragment, T: EuiccFragmentMarker
+val <T> T.portId: Int where T: Fragment, T: EuiccChannelFragmentMarker
     get() = requireArguments().getInt("portId")
 
-val <T> T.euiccChannelManager: EuiccChannelManager where T: Fragment, T: EuiccFragmentMarker
+val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccChannelFragmentMarker
-    get() = openEuiccApplication.euiccChannelManager
-
-val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccFragmentMarker
     get() =
         euiccChannelManager.findEuiccChannelByPortBlocking(slotId, portId)!!
 

app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt

@@ -1,18 +1,9 @@
 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: <https://stackoverflow.com/questions/12478520/how-to-set-dialogfragments-width-and-height>
 /**

app-common/src/main/java/im/angry/openeuicc/util/Utils.kt

@@ -3,7 +3,11 @@ package im.angry.openeuicc.util
 import android.content.Context
 import android.content.pm.PackageManager
 import android.se.omapi.SEService
+import android.telephony.TelephonyManager
+import androidx.fragment.app.Fragment
+import im.angry.openeuicc.OpenEuiccApplication
 import im.angry.openeuicc.core.EuiccChannel
+import im.angry.openeuicc.core.EuiccChannelManager
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -22,6 +26,24 @@ val Context.selfAppVersion: String
             throw RuntimeException(e)
         }
 
+interface OpenEuiccContextMarker {
+    val openEuiccMarkerContext: Context
+        get() = when (this) {
+            is Context -> this
+            is Fragment -> requireContext()
+            else -> throw RuntimeException("OpenEuiccUIContextMarker shall only be used on Fragments or UI types that derive from Context")
+        }
+
+    val openEuiccApplication: OpenEuiccApplication
+        get() = openEuiccMarkerContext.applicationContext as OpenEuiccApplication
+
+    val euiccChannelManager: EuiccChannelManager
+        get() = openEuiccApplication.euiccChannelManager
+
+    val telephonyManager: TelephonyManager
+        get() = openEuiccApplication.telephonyManager
+}
+
 val LocalProfileInfo.isEnabled: Boolean
     get() = state == LocalProfileInfo.State.Enabled
 

app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt

@@ -6,30 +6,23 @@ import android.telephony.euicc.DownloadableSubscription
 import android.telephony.euicc.EuiccInfo
 import android.util.Log
 import net.typeblog.lpac_jni.LocalProfileInfo
-import im.angry.openeuicc.OpenEuiccApplication
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.util.*
 import java.lang.IllegalStateException
 
-class OpenEuiccService : EuiccService() {
+class OpenEuiccService : EuiccService(), OpenEuiccContextMarker {
     companion object {
         const val TAG = "OpenEuiccService"
     }
 
-    private val openEuiccApplication
-        get() = application as OpenEuiccApplication
-
     private fun findChannel(physicalSlotId: Int): EuiccChannel? =
-        openEuiccApplication.euiccChannelManager
+        euiccChannelManager.findEuiccChannelByPhysicalSlotBlocking(physicalSlotId)
-            .findEuiccChannelByPhysicalSlotBlocking(physicalSlotId)
 
     private fun findChannel(slotId: Int, portId: Int): EuiccChannel? =
-        openEuiccApplication.euiccChannelManager
+        euiccChannelManager.findEuiccChannelByPortBlocking(slotId, portId)
-            .findEuiccChannelByPortBlocking(slotId, portId)
 
     private fun findAllChannels(physicalSlotId: Int): List<EuiccChannel>? =
-        openEuiccApplication.euiccChannelManager
+        euiccChannelManager.findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId)
-            .findAllEuiccChannelsByPhysicalSlotBlocking(physicalSlotId)
 
     override fun onGetEid(slotId: Int): String? =
         findChannel(slotId)?.lpa?.eID
@@ -41,7 +34,7 @@ class OpenEuiccService : EuiccService() {
         lpa.profiles.any { it.iccid == iccid }
 
     private fun ensurePortIsMapped(slotId: Int, portId: Int) {
-        val mappings = openEuiccApplication.telephonyManager.simSlotMapping.toMutableList()
+        val mappings = telephonyManager.simSlotMapping.toMutableList()
 
         mappings.firstOrNull { it.physicalSlotIndex == slotId && it.portIndex == portId }?.let {
             throw IllegalStateException("Slot $slotId port $portId has already been mapped")
@@ -57,14 +50,14 @@ class OpenEuiccService : EuiccService() {
         }
 
         try {
-            openEuiccApplication.telephonyManager.simSlotMapping = mappings
+            telephonyManager.simSlotMapping = mappings
             return
         } catch (_: Exception) {
 
         }
 
         // Sometimes hardware supports one ordering but not the reverse
-        openEuiccApplication.telephonyManager.simSlotMapping = mappings.reversed()
+        telephonyManager.simSlotMapping = mappings.reversed()
     }
 
     private fun <T> retryWithTimeout(timeoutMillis: Int, backoff: Int = 1000, f: () -> T?): T? {
@@ -233,7 +226,7 @@ class OpenEuiccService : EuiccService() {
         } catch (e: Exception) {
             return RESULT_FIRST_USER
         } finally {
-            openEuiccApplication.euiccChannelManager.invalidate()
+            euiccChannelManager.invalidate()
         }
     }
 

app/src/main/java/im/angry/openeuicc/ui/SlotMappingFragment.kt

@@ -26,7 +26,8 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-class SlotMappingFragment: BaseMaterialDialogFragment(), OnMenuItemClickListener {
+class SlotMappingFragment: BaseMaterialDialogFragment(),
+    OnMenuItemClickListener, OpenEuiccContextMarker {
     companion object {
         const val TAG = "SlotMappingFragment"
     }