Fix AOSP build by importing im.angry.openeuicc.util as wildcard

This is REQUIRED for AOSP build to work.

.idea/codeStyles/Project.xml

@@ -1,6 +1,11 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="im.angry.openeuicc.util" alias="false" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
@@ -120,4 +125,4 @@
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>

.idea/codeStyles/codeStyleConfig.xml

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

app-common/src/main/java/im/angry/openeuicc/core/DefaultEuiccChannelFactory.kt

@@ -6,12 +6,7 @@ import android.util.Log
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.usb.UsbApduInterface
 import im.angry.openeuicc.core.usb.UsbCcidContext
-import im.angry.openeuicc.util.FakeUiccCardInfoCompat
-import im.angry.openeuicc.util.FakeUiccPortInfoCompat
-import im.angry.openeuicc.util.UiccPortInfoCompat
-import im.angry.openeuicc.util.connectSEService
-import im.angry.openeuicc.util.encodeHex
-import im.angry.openeuicc.util.preferenceRepository
+import im.angry.openeuicc.util.*
 
 open class DefaultEuiccChannelFactory(protected val context: Context) : EuiccChannelFactory {
     private var seService: SEService? = null

app-common/src/main/java/im/angry/openeuicc/core/DefaultEuiccChannelManager.kt

@@ -9,13 +9,7 @@ import im.angry.openeuicc.core.usb.UsbCcidContext
 import im.angry.openeuicc.core.usb.interfaces
 import im.angry.openeuicc.core.usb.smartCard
 import im.angry.openeuicc.di.AppContainer
-import im.angry.openeuicc.util.FakeUiccCardInfoCompat
-import im.angry.openeuicc.util.UiccCardInfoCompat
-import im.angry.openeuicc.util.UiccPortInfoCompat
-import im.angry.openeuicc.util.VendorAidDecider
-import im.angry.openeuicc.util.activeModemCountCompat
-import im.angry.openeuicc.util.parseIsdrAidList
-import im.angry.openeuicc.util.queryVendorAidListTransformation
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.Flow

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt

@@ -2,7 +2,7 @@ package im.angry.openeuicc.core
 
 import android.os.Parcel
 import android.os.Parcelable
-import im.angry.openeuicc.util.UiccPortInfoCompat
+import im.angry.openeuicc.util.*
 import net.typeblog.lpac_jni.ApduInterface
 import net.typeblog.lpac_jni.LocalProfileAssistant
 

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelFactory.kt

@@ -1,7 +1,7 @@
 package im.angry.openeuicc.core
 
 import im.angry.openeuicc.core.usb.UsbCcidContext
-import im.angry.openeuicc.util.UiccPortInfoCompat
+import im.angry.openeuicc.util.*
 
 // This class is here instead of inside DI because it contains a bit more logic than just
 // "dumb" dependency injection.

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelImpl.kt

@@ -1,6 +1,6 @@
 package im.angry.openeuicc.core
 
-import im.angry.openeuicc.util.UiccPortInfoCompat
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking

app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelWrapper.kt

@@ -1,6 +1,6 @@
 package im.angry.openeuicc.core
 
-import im.angry.openeuicc.util.UiccPortInfoCompat
+import im.angry.openeuicc.util.*
 import net.typeblog.lpac_jni.ApduInterface
 import net.typeblog.lpac_jni.LocalProfileAssistant
 

app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt

@@ -4,9 +4,7 @@ import android.se.omapi.Channel
 import android.se.omapi.SEService
 import android.se.omapi.Session
 import android.util.Log
-import im.angry.openeuicc.util.UiccPortInfoCompat
-import im.angry.openeuicc.util.encodeHex
-import im.angry.openeuicc.util.getUiccReaderCompat
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking

app-common/src/main/java/im/angry/openeuicc/di/AppContainer.kt

@@ -5,7 +5,7 @@ import android.telephony.TelephonyManager
 import im.angry.openeuicc.core.EuiccChannelFactory
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.core.EuiccChannelManagerFactory
-import im.angry.openeuicc.util.PreferenceRepository
+import im.angry.openeuicc.util.*
 
 interface AppContainer {
     val telephonyManager: TelephonyManager

app-common/src/main/java/im/angry/openeuicc/di/DefaultAppContainer.kt

@@ -8,7 +8,7 @@ import im.angry.openeuicc.core.DefaultEuiccChannelManager
 import im.angry.openeuicc.core.DefaultEuiccChannelManagerFactory
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.core.EuiccChannelManagerFactory
-import im.angry.openeuicc.util.PreferenceRepository
+import im.angry.openeuicc.util.*
 
 open class DefaultAppContainer(context: Context) : AppContainer {
     override val telephonyManager by lazy {

app-common/src/main/java/im/angry/openeuicc/service/EuiccChannelManagerService.kt

@@ -14,9 +14,7 @@ import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.util.OpenEuiccContextMarker
-import im.angry.openeuicc.util.beginTrackedOperation
-import im.angry.openeuicc.util.switchProfile
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.channels.BufferOverflow

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

@@ -22,15 +22,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.util.EUICC_DEFAULT_ISDR_AID
-import im.angry.openeuicc.util.OpenEuiccContextMarker
-import im.angry.openeuicc.util.activityToolbarInsetHandler
-import im.angry.openeuicc.util.decodeHex
-import im.angry.openeuicc.util.encodeHex
-import im.angry.openeuicc.util.formatFreeSpace
-import im.angry.openeuicc.util.mainViewPaddingInsetHandler
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
-import im.angry.openeuicc.util.tryParseEuiccVendorInfo
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

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

@@ -32,23 +32,7 @@ import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
 import im.angry.openeuicc.ui.wizard.DownloadWizardActivity
-import im.angry.openeuicc.util.EuiccChannelFragmentMarker
-import im.angry.openeuicc.util.EuiccProfilesChangedListener
-import im.angry.openeuicc.util.displayName
-import im.angry.openeuicc.util.enabled
-import im.angry.openeuicc.util.ensureEuiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManagerService
-import im.angry.openeuicc.util.isEnabled
-import im.angry.openeuicc.util.isUsb
-import im.angry.openeuicc.util.mainViewPaddingInsetHandler
-import im.angry.openeuicc.util.newInstanceEuicc
-import im.angry.openeuicc.util.operational
-import im.angry.openeuicc.util.portId
-import im.angry.openeuicc.util.seId
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
-import im.angry.openeuicc.util.slotId
-import im.angry.openeuicc.util.withEuiccChannel
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.TimeoutCancellationException
 import kotlinx.coroutines.flow.StateFlow

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

@@ -12,14 +12,7 @@ import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
-import im.angry.openeuicc.util.EuiccChannelFragmentMarker
-import im.angry.openeuicc.util.ensureEuiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManagerService
-import im.angry.openeuicc.util.newInstanceEuicc
-import im.angry.openeuicc.util.notifyEuiccProfilesChanged
-import im.angry.openeuicc.util.portId
-import im.angry.openeuicc.util.seId
-import im.angry.openeuicc.util.slotId
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 

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

@@ -10,10 +10,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.activityToolbarInsetHandler
-import im.angry.openeuicc.util.mainViewPaddingInsetHandler
-import im.angry.openeuicc.util.preferenceRepository
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch

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

@@ -13,12 +13,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.activityToolbarInsetHandler
-import im.angry.openeuicc.util.mainViewPaddingInsetHandler
-import im.angry.openeuicc.util.readSelfLog
-import im.angry.openeuicc.util.selfAppVersion
-import im.angry.openeuicc.util.setupLogSaving
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

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

@@ -28,9 +28,7 @@ import com.google.android.material.tabs.TabLayoutMediator
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.ui.wizard.DownloadWizardActivity
-import im.angry.openeuicc.util.OpenEuiccContextMarker
-import im.angry.openeuicc.util.activityToolbarInsetHandler
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.first

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

@@ -23,11 +23,7 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.util.OpenEuiccContextMarker
-import im.angry.openeuicc.util.activityToolbarInsetHandler
-import im.angry.openeuicc.util.displayName
-import im.angry.openeuicc.util.mainViewPaddingInsetHandler
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

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

@@ -11,14 +11,7 @@ import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
-import im.angry.openeuicc.util.EuiccChannelFragmentMarker
-import im.angry.openeuicc.util.ensureEuiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManagerService
-import im.angry.openeuicc.util.newInstanceEuicc
-import im.angry.openeuicc.util.notifyEuiccProfilesChanged
-import im.angry.openeuicc.util.portId
-import im.angry.openeuicc.util.seId
-import im.angry.openeuicc.util.slotId
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 

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

@@ -14,15 +14,7 @@ import com.google.android.material.textfield.TextInputLayout
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
-import im.angry.openeuicc.util.EuiccChannelFragmentMarker
-import im.angry.openeuicc.util.ensureEuiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManagerService
-import im.angry.openeuicc.util.newInstanceEuicc
-import im.angry.openeuicc.util.notifyEuiccProfilesChanged
-import im.angry.openeuicc.util.portId
-import im.angry.openeuicc.util.seId
-import im.angry.openeuicc.util.setWidthPercent
-import im.angry.openeuicc.util.slotId
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.launch
 import net.typeblog.lpac_jni.LocalProfileAssistant
 

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

@@ -6,8 +6,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import im.angry.openeuicc.OpenEuiccApplication
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.activityToolbarInsetHandler
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
+import im.angry.openeuicc.util.*
 
 class SettingsActivity : AppCompatActivity() {
     private val appContainer

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

@@ -13,11 +13,7 @@ import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.OpenEuiccContextMarker
-import im.angry.openeuicc.util.PreferenceFlowWrapper
-import im.angry.openeuicc.util.mainViewPaddingInsetHandler
-import im.angry.openeuicc.util.selfAppVersion
-import im.angry.openeuicc.util.setupRootViewSystemBarInsets
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch

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

@@ -22,7 +22,7 @@ import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.util.OpenEuiccContextMarker
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

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

@@ -22,8 +22,7 @@ import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.ui.BaseEuiccAccessActivity
-import im.angry.openeuicc.util.LPAString
-import im.angry.openeuicc.util.OpenEuiccContextMarker
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.typeblog.lpac_jni.LocalProfileAssistant

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

@@ -7,8 +7,7 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.encodeHex
-import im.angry.openeuicc.util.setupLogSaving
+import im.angry.openeuicc.util.*
 import org.json.JSONObject
 import java.util.Date
 

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

@@ -19,9 +19,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.util.LPAString
-import im.angry.openeuicc.util.decodeQrFromBitmap
-import im.angry.openeuicc.util.use
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext

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

@@ -14,9 +14,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.service.EuiccChannelManagerService
-import im.angry.openeuicc.util.ensureEuiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManagerService
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch

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

@@ -15,11 +15,7 @@ import androidx.recyclerview.widget.RecyclerView.ViewHolder
 import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
-import im.angry.openeuicc.util.displayName
-import im.angry.openeuicc.util.enabled
-import im.angry.openeuicc.util.ensureEuiccChannelManager
-import im.angry.openeuicc.util.euiccChannelManager
-import im.angry.openeuicc.util.formatFreeSpace
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.flatMapConcat
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.toList

app-unpriv/src/main/java/im/angry/openeuicc/UnprivilegedOpenEuiccApplication.kt

@@ -3,7 +3,7 @@ package im.angry.openeuicc
 import android.content.Intent
 import im.angry.openeuicc.di.UnprivilegedAppContainer
 import im.angry.openeuicc.ui.LogsActivity
-import im.angry.openeuicc.util.readSelfLog
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.runBlocking
 import kotlin.system.exitProcess
 

app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedAppContainer.kt

@@ -1,7 +1,7 @@
 package im.angry.openeuicc.di
 
 import android.content.Context
-import im.angry.openeuicc.util.UnprivilegedPreferenceRepository
+import im.angry.openeuicc.util.*
 
 class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context) {
     override val uiComponentFactory by lazy {
@@ -15,4 +15,4 @@ class UnprivilegedAppContainer(context: Context) : DefaultAppContainer(context)
     override val preferenceRepository by lazy {
         UnprivilegedPreferenceRepository(context)
     }
-}
+}

app-unpriv/src/main/java/im/angry/openeuicc/di/UnprivilegedCustomizableTextProvider.kt

@@ -8,8 +8,7 @@ import androidx.core.net.toUri
 import im.angry.easyeuicc.R
 import im.angry.openeuicc.common.BuildConfig
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.util.selfAppVersion
-import im.angry.openeuicc.util.selfAppVersionCode
+import im.angry.openeuicc.util.*
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
 

app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityActivity.kt

@@ -5,7 +5,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import im.angry.easyeuicc.R
 import im.angry.openeuicc.di.UnprivilegedUiComponentFactory
-import im.angry.openeuicc.util.OpenEuiccContextMarker
+import im.angry.openeuicc.util.*
 
 class QuickCompatibilityActivity : AppCompatActivity(), OpenEuiccContextMarker {
     override fun onCreate(savedInstanceState: Bundle?) {

app-unpriv/src/main/java/im/angry/openeuicc/ui/QuickCompatibilityFragment.kt

@@ -15,10 +15,7 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import im.angry.easyeuicc.R
-import im.angry.openeuicc.util.EUICC_DEFAULT_ISDR_AID
-import im.angry.openeuicc.util.UnprivilegedEuiccContextMarker
-import im.angry.openeuicc.util.connectSEService
-import im.angry.openeuicc.util.decodeHex
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
@@ -183,4 +180,4 @@ private inline val Reader.isSIM: Boolean
     get() = name.startsWith("SIM")
 
 private inline val Reader.slotIndex: Int
-    get() = (name.replace("SIM", "").toIntOrNull() ?: 1) - 1 // 0-based index
+    get() = (name.replace("SIM", "").toIntOrNull() ?: 1) - 1 // 0-based index

app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedEuiccManagementFragment.kt

@@ -7,9 +7,7 @@ import android.view.MenuItem
 import android.widget.Toast
 import im.angry.easyeuicc.R
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.util.SIMToolkit
-import im.angry.openeuicc.util.newInstanceEuicc
-import im.angry.openeuicc.util.slotId
+import im.angry.openeuicc.util.*
 
 
 class UnprivilegedEuiccManagementFragment : EuiccManagementFragment() {

app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedMainActivity.kt

@@ -8,8 +8,7 @@ import androidx.core.content.pm.ShortcutInfoCompat
 import androidx.core.graphics.drawable.IconCompat
 import androidx.core.graphics.drawable.toBitmap
 import im.angry.easyeuicc.R
-import im.angry.openeuicc.util.SIMToolkit
-import im.angry.openeuicc.util.UnprivilegedEuiccContextMarker
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking
 

app-unpriv/src/main/java/im/angry/openeuicc/ui/UnprivilegedSettingsFragment.kt

@@ -8,7 +8,7 @@ import android.os.Bundle
 import android.widget.Toast
 import androidx.preference.Preference
 import im.angry.easyeuicc.R
-import im.angry.openeuicc.util.encodeHex
+import im.angry.openeuicc.util.*
 import java.security.MessageDigest
 
 class UnprivilegedSettingsFragment : SettingsFragment() {

app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelFactory.kt

@@ -3,11 +3,7 @@ package im.angry.openeuicc.core
 import android.content.Context
 import android.util.Log
 import im.angry.openeuicc.R
-import im.angry.openeuicc.util.PrivilegedEuiccContextMarker
-import im.angry.openeuicc.util.RealUiccPortInfoCompat
-import im.angry.openeuicc.util.UiccPortInfoCompat
-import im.angry.openeuicc.util.encodeHex
-import im.angry.openeuicc.util.preferenceRepository
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.first
 
 class PrivilegedEuiccChannelFactory(context: Context) : DefaultEuiccChannelFactory(context),

app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManager.kt

@@ -2,11 +2,7 @@ package im.angry.openeuicc.core
 
 import android.content.Context
 import im.angry.openeuicc.di.AppContainer
-import im.angry.openeuicc.util.UiccCardInfoCompat
-import im.angry.openeuicc.util.cardId
-import im.angry.openeuicc.util.iccCloseLogicalChannelBySlot
-import im.angry.openeuicc.util.tryRefreshCachedEuiccInfo
-import im.angry.openeuicc.util.uiccCardsInfoCompat
+import im.angry.openeuicc.util.*
 
 class PrivilegedEuiccChannelManager(appContainer: AppContainer, context: Context) :
     DefaultEuiccChannelManager(appContainer, context) {

app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt

@@ -3,12 +3,7 @@ package im.angry.openeuicc.core
 import android.telephony.IccOpenLogicalChannelResponse
 import android.telephony.TelephonyManager
 import android.util.Log
-import im.angry.openeuicc.util.UiccPortInfoCompat
-import im.angry.openeuicc.util.decodeHex
-import im.angry.openeuicc.util.encodeHex
-import im.angry.openeuicc.util.iccCloseLogicalChannelByPortCompat
-import im.angry.openeuicc.util.iccOpenLogicalChannelByPortCompat
-import im.angry.openeuicc.util.iccTransmitApduLogicalChannelByPortCompat
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking

app/src/main/java/im/angry/openeuicc/di/PrivilegedAppContainer.kt

@@ -6,7 +6,7 @@ import im.angry.openeuicc.core.EuiccChannelManagerFactory
 import im.angry.openeuicc.core.PrivilegedEuiccChannelFactory
 import im.angry.openeuicc.core.PrivilegedEuiccChannelManager
 import im.angry.openeuicc.core.PrivilegedEuiccChannelManagerFactory
-import im.angry.openeuicc.util.PrivilegedPreferenceRepository
+import im.angry.openeuicc.util.*
 
 class PrivilegedAppContainer(context: Context) : DefaultAppContainer(context) {
     override val euiccChannelManager: EuiccChannelManager by lazy {

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

@@ -14,15 +14,7 @@ import android.util.Log
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.service.EuiccChannelManagerService.Companion.waitDone
-import im.angry.openeuicc.util.OpenEuiccContextMarker
-import im.angry.openeuicc.util.bindServiceSuspended
-import im.angry.openeuicc.util.cardId
-import im.angry.openeuicc.util.displayName
-import im.angry.openeuicc.util.enabled
-import im.angry.openeuicc.util.operational
-import im.angry.openeuicc.util.simSlotMapping
-import im.angry.openeuicc.util.tryRefreshCachedEuiccInfo
-import im.angry.openeuicc.util.uiccCardsInfoCompat
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.runBlocking

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

@@ -6,10 +6,7 @@ import android.widget.Button
 import android.widget.PopupMenu
 import im.angry.openeuicc.R
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.util.isEnabled
-import im.angry.openeuicc.util.isMEP
-import im.angry.openeuicc.util.newInstanceEuicc
-import im.angry.openeuicc.util.withEuiccChannel
+import im.angry.openeuicc.util.*
 import net.typeblog.lpac_jni.LocalProfileInfo
 
 class PrivilegedEuiccManagementFragment : EuiccManagementFragment() {

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

@@ -5,9 +5,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
 import im.angry.openeuicc.R
-import im.angry.openeuicc.util.dsdsEnabled
-import im.angry.openeuicc.util.setDsdsEnabled
-import im.angry.openeuicc.util.supportsDSDS
+import im.angry.openeuicc.util.*
 
 class PrivilegedMainActivity : MainActivity() {
     override fun onCreateOptionsMenu(menu: Menu): Boolean {

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

@@ -4,7 +4,7 @@ import android.os.Bundle
 import androidx.preference.CheckBoxPreference
 import androidx.preference.Preference
 import im.angry.openeuicc.R
-import im.angry.openeuicc.util.PrivilegedEuiccContextMarker
+import im.angry.openeuicc.util.*
 
 class PrivilegedSettingsFragment : SettingsFragment(), PrivilegedEuiccContextMarker {
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {

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

@@ -19,14 +19,7 @@ import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import im.angry.openeuicc.R
-import im.angry.openeuicc.util.OpenEuiccContextMarker
-import im.angry.openeuicc.util.UiccPortInfoCompat
-import im.angry.openeuicc.util.dsdsEnabled
-import im.angry.openeuicc.util.setWidthPercent
-import im.angry.openeuicc.util.simSlotMapping
-import im.angry.openeuicc.util.supportsDSDS
-import im.angry.openeuicc.util.uiccCardsInfoCompat
-import im.angry.openeuicc.util.updateSimSlotMapping
+import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext