From 65d97a92ea2ce1e9cb655bfc32ac5a0e82afd826 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 28 Nov 2023 17:54:42 -0500
Subject: [PATCH 1/5] themes: Improve colors

---
 app/src/main/res/values/themes.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c07d0ec..8836304 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,9 +11,11 @@
         <item name="colorOnSecondary">@color/white</item>
         <item name="colorAccent">?attr/colorSecondary</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="android:statusBarColor">?attr/colorPrimary</item>
+        <item name="android:windowLightStatusBar">true</item>
         <!-- Customize your theme here. -->
         <item name="alertDialogTheme">@style/AlertDialogTheme</item>
+        <item name="android:navigationBarColor">?attr/colorSecondary</item>
     </style>
 
     <style name="Theme.OpenEUICC.Input.Cursor" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">

From 05485b2c5d74007cc7c017f18ec62f7b0f8c7f4c Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 28 Nov 2023 17:56:06 -0500
Subject: [PATCH 2/5] ProfileDownloadFragment: Disable all text input during
 download

---
 .../main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt b/app/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
index 61e4f55..dced288 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
+++ b/app/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
@@ -132,6 +132,8 @@ class ProfileDownloadFragment : DialogFragment(), EuiccFragmentMarker, Toolbar.O
 
         profileDownloadServer.editText!!.isEnabled = false
         profileDownloadCode.editText!!.isEnabled = false
+        profileDownloadConfirmationCode.editText!!.isEnabled = false
+        profileDownloadIMEI.editText!!.isEnabled = false
 
         progress.isIndeterminate = true
         progress.visibility = View.VISIBLE

From 95bfa5525fa064e177266de55b94f57646fac5e9 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 28 Nov 2023 17:58:26 -0500
Subject: [PATCH 3/5] manifest: Add uses-feature flag for telephony

---
 app/src/main/AndroidManifest.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1956b26..d82928e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,10 @@
     tools:ignore="ProtectedPermissions"
     package="im.angry.openeuicc">
 
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="true" />
+
     <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
     <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
     <uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />

From 6d9e4c579b41ae45570a7909737dc98a03bf99ed Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 28 Nov 2023 18:26:24 -0500
Subject: [PATCH 4/5] refactor: [1/n] Separate app into app and app-common

Going forward, app-common should end up containing ONLY unprivileged
code
---
 .idea/compiler.xml                            |  4 +-
 .idea/gradle.xml                              |  1 +
 app-common/.gitignore                         |  1 +
 app-common/build.gradle                       | 47 +++++++++++++++++++
 app-common/consumer-rules.pro                 |  0
 app-common/proguard-rules.pro                 | 21 +++++++++
 .../common/ExampleInstrumentedTest.kt         | 24 ++++++++++
 app-common/src/main/AndroidManifest.xml       | 22 +++++++++
 .../angry/openeuicc/OpenEuiccApplication.kt   |  0
 .../im/angry/openeuicc/core/EuiccChannel.kt   |  0
 .../openeuicc/core/EuiccChannelManager.kt     |  0
 .../openeuicc/core/OmapiApduInterface.kt      |  0
 .../core/TelephonyManagerApduInterface.kt     |  0
 .../openeuicc/ui/EuiccChannelFragmentUtils.kt |  0
 .../openeuicc/ui/EuiccManagementFragment.kt   |  2 +-
 .../im/angry/openeuicc/ui/MainActivity.kt     |  2 +-
 .../openeuicc/ui/ProfileDeleteFragment.kt     |  2 +-
 .../openeuicc/ui/ProfileDownloadFragment.kt   |  2 +-
 .../openeuicc/ui/ProfileRenameFragment.kt     |  2 +-
 .../im/angry/openeuicc/util/StringUtils.kt    |  0
 .../im/angry/openeuicc/util/TelephonyUtils.kt |  0
 .../java/im/angry/openeuicc/util/UiUtils.kt   |  0
 .../src/main/res/drawable/ic_add.xml          |  0
 .../src/main/res/drawable/ic_check_black.xml  |  0
 .../src/main/res/drawable/ic_menu_black.xml   |  0
 .../src/main/res/drawable/ic_scan_black.xml   |  0
 .../src/main/res/layout/activity_main.xml     |  0
 .../src/main/res/layout/euicc_profile.xml     |  0
 .../src/main/res/layout/fragment_euicc.xml    |  0
 .../res/layout/fragment_profile_download.xml  |  0
 .../res/layout/fragment_profile_rename.xml    |  0
 .../src/main/res/layout/spinner_item.xml      |  0
 .../src/main/res/menu/activity_main.xml       |  0
 .../res/menu/fragment_profile_download.xml    |  0
 .../main/res/menu/fragment_profile_rename.xml |  0
 .../src/main/res/menu/profile_options.xml     |  0
 .../main/res/raw/symantec_gsma_rspv2_root_ci1 |  0
 .../src/main/res/values/colors.xml            |  0
 app-common/src/main/res/values/strings.xml    | 34 ++++++++++++++
 .../src/main/res/values/themes.xml            |  0
 .../main/res/xml/network_security_config.xml  |  0
 .../angry/openeuicc/common/ExampleUnitTest.kt | 17 +++++++
 app/build.gradle                              | 10 +---
 app/src/main/AndroidManifest.xml              | 18 +------
 app/src/main/res/values/strings.xml           | 32 -------------
 settings.gradle                               |  1 +
 46 files changed, 177 insertions(+), 65 deletions(-)
 create mode 100644 app-common/.gitignore
 create mode 100644 app-common/build.gradle
 create mode 100644 app-common/consumer-rules.pro
 create mode 100644 app-common/proguard-rules.pro
 create mode 100644 app-common/src/androidTest/java/im/angry/openeuicc/common/ExampleInstrumentedTest.kt
 create mode 100644 app-common/src/main/AndroidManifest.xml
 rename {app => app-common}/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt (99%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/ui/MainActivity.kt (99%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt (98%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt (99%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt (99%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/util/StringUtils.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt (100%)
 rename {app => app-common}/src/main/java/im/angry/openeuicc/util/UiUtils.kt (100%)
 rename {app => app-common}/src/main/res/drawable/ic_add.xml (100%)
 rename {app => app-common}/src/main/res/drawable/ic_check_black.xml (100%)
 rename {app => app-common}/src/main/res/drawable/ic_menu_black.xml (100%)
 rename {app => app-common}/src/main/res/drawable/ic_scan_black.xml (100%)
 rename {app => app-common}/src/main/res/layout/activity_main.xml (100%)
 rename {app => app-common}/src/main/res/layout/euicc_profile.xml (100%)
 rename {app => app-common}/src/main/res/layout/fragment_euicc.xml (100%)
 rename {app => app-common}/src/main/res/layout/fragment_profile_download.xml (100%)
 rename {app => app-common}/src/main/res/layout/fragment_profile_rename.xml (100%)
 rename {app => app-common}/src/main/res/layout/spinner_item.xml (100%)
 rename {app => app-common}/src/main/res/menu/activity_main.xml (100%)
 rename {app => app-common}/src/main/res/menu/fragment_profile_download.xml (100%)
 rename {app => app-common}/src/main/res/menu/fragment_profile_rename.xml (100%)
 rename {app => app-common}/src/main/res/menu/profile_options.xml (100%)
 rename {app => app-common}/src/main/res/raw/symantec_gsma_rspv2_root_ci1 (100%)
 rename {app => app-common}/src/main/res/values/colors.xml (100%)
 create mode 100644 app-common/src/main/res/values/strings.xml
 rename {app => app-common}/src/main/res/values/themes.xml (100%)
 rename {app => app-common}/src/main/res/xml/network_security_config.xml (100%)
 create mode 100644 app-common/src/test/java/im/angry/openeuicc/common/ExampleUnitTest.kt

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 69fd9ef..8eb4222 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -3,11 +3,9 @@
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="1.7">
       <module name="OpenEUICC.app" target="17" />
+      <module name="OpenEUICC.app-common" target="17" />
       <module name="OpenEUICC.libs.hidden-apis-shim" target="17" />
       <module name="OpenEUICC.libs.lpac-jni" target="17" />
-      <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector" target="17" />
-      <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.main" target="17" />
-      <module name="OpenEUICC.libs.lpad-sm-dp-plus-connector.test" target="17" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 749c0ae..61fb4b6 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -13,6 +13,7 @@
           <set>
             <option value="$PROJECT_DIR$" />
             <option value="$PROJECT_DIR$/app" />
+            <option value="$PROJECT_DIR$/app-common" />
             <option value="$PROJECT_DIR$/libs" />
             <option value="$PROJECT_DIR$/libs/hidden-apis-shim" />
             <option value="$PROJECT_DIR$/libs/hidden-apis-stub" />
diff --git a/app-common/.gitignore b/app-common/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/app-common/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/app-common/build.gradle b/app-common/build.gradle
new file mode 100644
index 0000000..bb33349
--- /dev/null
+++ b/app-common/build.gradle
@@ -0,0 +1,47 @@
+plugins {
+    id 'com.android.library'
+    id 'org.jetbrains.kotlin.android'
+}
+
+android {
+    namespace 'im.angry.openeuicc.common'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 30
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+}
+
+dependencies {
+    compileOnly project(':libs:hidden-apis-stub')
+    implementation project(':libs:hidden-apis-shim')
+    implementation project(":libs:lpac-jni")
+    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+}
\ No newline at end of file
diff --git a/app-common/consumer-rules.pro b/app-common/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/app-common/proguard-rules.pro b/app-common/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/app-common/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/app-common/src/androidTest/java/im/angry/openeuicc/common/ExampleInstrumentedTest.kt b/app-common/src/androidTest/java/im/angry/openeuicc/common/ExampleInstrumentedTest.kt
new file mode 100644
index 0000000..b027bbe
--- /dev/null
+++ b/app-common/src/androidTest/java/im/angry/openeuicc/common/ExampleInstrumentedTest.kt
@@ -0,0 +1,24 @@
+package im.angry.openeuicc.common
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("im.angry.openeuicc.common.test", appContext.packageName)
+    }
+}
\ No newline at end of file
diff --git a/app-common/src/main/AndroidManifest.xml b/app-common/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..f833c4d
--- /dev/null
+++ b/app-common/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="ProtectedPermissions">
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="true" />
+
+    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION" />
+
+    <application
+        android:networkSecurityConfig="@xml/network_security_config">
+        <activity
+            android:name="com.journeyapps.barcodescanner.CaptureActivity"
+            android:screenOrientation="fullSensor"
+            tools:replace="screenOrientation" />
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/app/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt b/app-common/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt
rename to app-common/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt
diff --git a/app/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt b/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt
rename to app-common/src/main/java/im/angry/openeuicc/core/EuiccChannel.kt
diff --git a/app/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt b/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt
rename to app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt
diff --git a/app/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt b/app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
rename to app-common/src/main/java/im/angry/openeuicc/core/OmapiApduInterface.kt
diff --git a/app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt b/app-common/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
rename to app-common/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
diff --git a/app/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
rename to app-common/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
diff --git a/app/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
similarity index 99%
rename from app/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
rename to app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
index 959588e..0b24114 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt
@@ -19,7 +19,7 @@ import androidx.recyclerview.widget.RecyclerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.google.android.material.floatingactionbutton.FloatingActionButton
 import net.typeblog.lpac_jni.LocalProfileInfo
-import im.angry.openeuicc.R
+import im.angry.openeuicc.common.R
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
similarity index 99%
rename from app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
rename to app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
index 7a86790..8eb7092 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
@@ -12,7 +12,7 @@ import android.widget.Spinner
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
-import im.angry.openeuicc.R
+import im.angry.openeuicc.common.R
 import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt
similarity index 98%
rename from app/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt
rename to app-common/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt
index 55a0457..92571ad 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt
@@ -6,7 +6,7 @@ import android.util.Log
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
-import im.angry.openeuicc.R
+import im.angry.openeuicc.common.R
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
diff --git a/app/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
similarity index 99%
rename from app/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
rename to app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
index dced288..18cdb0b 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileDownloadFragment.kt
@@ -13,7 +13,7 @@ import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
 import com.journeyapps.barcodescanner.ScanContract
 import com.journeyapps.barcodescanner.ScanOptions
-import im.angry.openeuicc.R
+import im.angry.openeuicc.common.R
 import im.angry.openeuicc.util.setWidthPercent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
similarity index 99%
rename from app/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
rename to app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
index e151498..d940036 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/ProfileRenameFragment.kt
@@ -13,7 +13,7 @@ import androidx.appcompat.widget.Toolbar
 import androidx.fragment.app.DialogFragment
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.textfield.TextInputLayout
-import im.angry.openeuicc.R
+import im.angry.openeuicc.common.R
 import im.angry.openeuicc.util.setWidthPercent
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/im/angry/openeuicc/util/StringUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/util/StringUtils.kt
rename to app-common/src/main/java/im/angry/openeuicc/util/StringUtils.kt
diff --git a/app/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt
rename to app-common/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt
diff --git a/app/src/main/java/im/angry/openeuicc/util/UiUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt
similarity index 100%
rename from app/src/main/java/im/angry/openeuicc/util/UiUtils.kt
rename to app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt
diff --git a/app/src/main/res/drawable/ic_add.xml b/app-common/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add.xml
rename to app-common/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_check_black.xml b/app-common/src/main/res/drawable/ic_check_black.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_check_black.xml
rename to app-common/src/main/res/drawable/ic_check_black.xml
diff --git a/app/src/main/res/drawable/ic_menu_black.xml b/app-common/src/main/res/drawable/ic_menu_black.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_menu_black.xml
rename to app-common/src/main/res/drawable/ic_menu_black.xml
diff --git a/app/src/main/res/drawable/ic_scan_black.xml b/app-common/src/main/res/drawable/ic_scan_black.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_scan_black.xml
rename to app-common/src/main/res/drawable/ic_scan_black.xml
diff --git a/app/src/main/res/layout/activity_main.xml b/app-common/src/main/res/layout/activity_main.xml
similarity index 100%
rename from app/src/main/res/layout/activity_main.xml
rename to app-common/src/main/res/layout/activity_main.xml
diff --git a/app/src/main/res/layout/euicc_profile.xml b/app-common/src/main/res/layout/euicc_profile.xml
similarity index 100%
rename from app/src/main/res/layout/euicc_profile.xml
rename to app-common/src/main/res/layout/euicc_profile.xml
diff --git a/app/src/main/res/layout/fragment_euicc.xml b/app-common/src/main/res/layout/fragment_euicc.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_euicc.xml
rename to app-common/src/main/res/layout/fragment_euicc.xml
diff --git a/app/src/main/res/layout/fragment_profile_download.xml b/app-common/src/main/res/layout/fragment_profile_download.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_profile_download.xml
rename to app-common/src/main/res/layout/fragment_profile_download.xml
diff --git a/app/src/main/res/layout/fragment_profile_rename.xml b/app-common/src/main/res/layout/fragment_profile_rename.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_profile_rename.xml
rename to app-common/src/main/res/layout/fragment_profile_rename.xml
diff --git a/app/src/main/res/layout/spinner_item.xml b/app-common/src/main/res/layout/spinner_item.xml
similarity index 100%
rename from app/src/main/res/layout/spinner_item.xml
rename to app-common/src/main/res/layout/spinner_item.xml
diff --git a/app/src/main/res/menu/activity_main.xml b/app-common/src/main/res/menu/activity_main.xml
similarity index 100%
rename from app/src/main/res/menu/activity_main.xml
rename to app-common/src/main/res/menu/activity_main.xml
diff --git a/app/src/main/res/menu/fragment_profile_download.xml b/app-common/src/main/res/menu/fragment_profile_download.xml
similarity index 100%
rename from app/src/main/res/menu/fragment_profile_download.xml
rename to app-common/src/main/res/menu/fragment_profile_download.xml
diff --git a/app/src/main/res/menu/fragment_profile_rename.xml b/app-common/src/main/res/menu/fragment_profile_rename.xml
similarity index 100%
rename from app/src/main/res/menu/fragment_profile_rename.xml
rename to app-common/src/main/res/menu/fragment_profile_rename.xml
diff --git a/app/src/main/res/menu/profile_options.xml b/app-common/src/main/res/menu/profile_options.xml
similarity index 100%
rename from app/src/main/res/menu/profile_options.xml
rename to app-common/src/main/res/menu/profile_options.xml
diff --git a/app/src/main/res/raw/symantec_gsma_rspv2_root_ci1 b/app-common/src/main/res/raw/symantec_gsma_rspv2_root_ci1
similarity index 100%
rename from app/src/main/res/raw/symantec_gsma_rspv2_root_ci1
rename to app-common/src/main/res/raw/symantec_gsma_rspv2_root_ci1
diff --git a/app/src/main/res/values/colors.xml b/app-common/src/main/res/values/colors.xml
similarity index 100%
rename from app/src/main/res/values/colors.xml
rename to app-common/src/main/res/values/colors.xml
diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
new file mode 100644
index 0000000..38b1972
--- /dev/null
+++ b/app-common/src/main/res/values/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="no_euicc">No eUICC found on this device.\nOn some devices, you may need to enable dual SIM first in the menu of this app.</string>
+
+    <string name="dsds">Dual SIM</string>
+
+    <string name="enabled">Enabled</string>
+    <string name="disabled">Disabled</string>
+    <string name="provider">Provider:</string>
+    <string name="iccid">ICCID:</string>
+
+    <string name="enable">Enable</string>
+    <string name="disable">Disable</string>
+    <string name="delete">Delete</string>
+    <string name="rename">Rename</string>
+
+    <string name="toast_profile_enabled">eSIM profile switched. Please wait for a while when the card is restarting.</string>
+    <string name="toast_profile_enable_failed">Cannot switch to new eSIM profile.</string>
+    <string name="toast_profile_name_too_long">Nickname cannot be longer than 64 characters</string>
+    <string name="toast_dsds_switched">DSDS state switched. Please wait until the modem restarts.</string>
+
+    <string name="profile_download">New eSIM</string>
+    <string name="profile_download_server">Server (RSP / SM-DP+)</string>
+    <string name="profile_download_code">Activation Code</string>
+    <string name="profile_download_confirmation_code">Confirmation Code (Optional)</string>
+    <string name="profile_download_imei">IMEI (Optional)</string>
+    <string name="profile_download_scan">Scan QR Code</string>
+    <string name="profile_download_ok">Download</string>
+    <string name="profile_download_failed">Failed to download eSIM. Check your activation / QR code.</string>
+
+    <string name="profile_rename_new_name">New nickname</string>
+
+    <string name="profile_delete_confirm">Are you sure you want to delete the profile %s? This operation is irreversible.</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app-common/src/main/res/values/themes.xml
similarity index 100%
rename from app/src/main/res/values/themes.xml
rename to app-common/src/main/res/values/themes.xml
diff --git a/app/src/main/res/xml/network_security_config.xml b/app-common/src/main/res/xml/network_security_config.xml
similarity index 100%
rename from app/src/main/res/xml/network_security_config.xml
rename to app-common/src/main/res/xml/network_security_config.xml
diff --git a/app-common/src/test/java/im/angry/openeuicc/common/ExampleUnitTest.kt b/app-common/src/test/java/im/angry/openeuicc/common/ExampleUnitTest.kt
new file mode 100644
index 0000000..6a11944
--- /dev/null
+++ b/app-common/src/test/java/im/angry/openeuicc/common/ExampleUnitTest.kt
@@ -0,0 +1,17 @@
+package im.angry.openeuicc.common
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 0f24482..6c3ee1b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -85,15 +85,9 @@ android {
 dependencies {
     compileOnly project(':libs:hidden-apis-stub')
     implementation project(':libs:hidden-apis-shim')
-    implementation project(":libs:lpac-jni")
-    implementation 'androidx.core:core-ktx:1.12.0'
+    implementation project(':libs:lpac-jni')
+    implementation project(":app-common")
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d82928e..6ffc6cf 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,16 +4,6 @@
     tools:ignore="ProtectedPermissions"
     package="im.angry.openeuicc">
 
-    <uses-feature
-        android:name="android.hardware.telephony"
-        android:required="true" />
-
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />
-    <uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SECURE_ELEMENT_PRIVILEGED_OPERATION" />
-
     <application
         android:name=".OpenEuiccApplication"
         android:allowBackup="true"
@@ -21,8 +11,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.OpenEUICC"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:theme="@style/Theme.OpenEUICC">
         <activity
             android:name=".ui.MainActivity"
             android:exported="true">
@@ -52,11 +41,6 @@
                 <category android:name="android.service.euicc.category.EUICC_UI" />
             </intent-filter>
         </activity>
-
-        <activity
-            android:name="com.journeyapps.barcodescanner.CaptureActivity"
-            android:screenOrientation="fullSensor"
-            tools:replace="screenOrientation" />
     </application>
 
 </manifest>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6ebf774..60ef1da 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,35 +1,3 @@
 <resources>
     <string name="app_name">OpenEUICC</string>
-
-    <string name="no_euicc">No eUICC found on this device.\nOn some devices, you may need to enable dual SIM first in the menu of this app.</string>
-
-    <string name="dsds">Dual SIM</string>
-
-    <string name="enabled">Enabled</string>
-    <string name="disabled">Disabled</string>
-    <string name="provider">Provider:</string>
-    <string name="iccid">ICCID:</string>
-
-    <string name="enable">Enable</string>
-    <string name="disable">Disable</string>
-    <string name="delete">Delete</string>
-    <string name="rename">Rename</string>
-
-    <string name="toast_profile_enabled">eSIM profile switched. Please wait for a while when the card is restarting.</string>
-    <string name="toast_profile_enable_failed">Cannot switch to new eSIM profile.</string>
-    <string name="toast_profile_name_too_long">Nickname cannot be longer than 64 characters</string>
-    <string name="toast_dsds_switched">DSDS state switched. Please wait until the modem restarts.</string>
-
-    <string name="profile_download">New eSIM</string>
-    <string name="profile_download_server">Server (RSP / SM-DP+)</string>
-    <string name="profile_download_code">Activation Code</string>
-    <string name="profile_download_confirmation_code">Confirmation Code (Optional)</string>
-    <string name="profile_download_imei">IMEI (Optional)</string>
-    <string name="profile_download_scan">Scan QR Code</string>
-    <string name="profile_download_ok">Download</string>
-    <string name="profile_download_failed">Failed to download eSIM. Check your activation / QR code.</string>
-
-    <string name="profile_rename_new_name">New nickname</string>
-
-    <string name="profile_delete_confirm">Are you sure you want to delete the profile %s? This operation is irreversible.</string>
 </resources>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 217f940..4da7f0c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,3 +17,4 @@ include ':app'
 include ':libs:hidden-apis-stub'
 include ':libs:hidden-apis-shim'
 include ':libs:lpac-jni'
+include ':app-common'

From 5ed4c84bf24bd29c859d8344313f385a8ec04c7d Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 28 Nov 2023 18:51:01 -0500
Subject: [PATCH 5/5] refactor: [2/n] Move TelephonyApduInterface to privileged
 code only

---
 ...ication.kt => BaseOpenEuiccApplication.kt} | 13 ++----
 ...lManager.kt => BaseEuiccChannelManager.kt} | 43 ++++---------------
 .../openeuicc/ui/EuiccChannelFragmentUtils.kt |  4 +-
 .../im/angry/openeuicc/ui/MainActivity.kt     |  4 +-
 .../java/im/angry/openeuicc/util/UiUtils.kt   |  8 ++--
 app/src/main/AndroidManifest.xml              |  2 +-
 .../PrivilegedOpenEuiccApplication.kt         | 15 +++++++
 .../core/PrivilegedEuiccChannelManager.kt     | 38 ++++++++++++++++
 .../core/TelephonyManagerApduInterface.kt     |  0
 .../openeuicc/service/OpenEuiccService.kt     |  4 +-
 10 files changed, 76 insertions(+), 55 deletions(-)
 rename app-common/src/main/java/im/angry/openeuicc/{OpenEuiccApplication.kt => BaseOpenEuiccApplication.kt} (55%)
 rename app-common/src/main/java/im/angry/openeuicc/core/{EuiccChannelManager.kt => BaseEuiccChannelManager.kt} (69%)
 create mode 100644 app/src/main/java/im/angry/openeuicc/PrivilegedOpenEuiccApplication.kt
 create mode 100644 app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManager.kt
 rename {app-common => app}/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt (100%)

diff --git a/app-common/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt b/app-common/src/main/java/im/angry/openeuicc/BaseOpenEuiccApplication.kt
similarity index 55%
rename from app-common/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt
rename to app-common/src/main/java/im/angry/openeuicc/BaseOpenEuiccApplication.kt
index 131b099..1a2fcb7 100644
--- a/app-common/src/main/java/im/angry/openeuicc/OpenEuiccApplication.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/BaseOpenEuiccApplication.kt
@@ -3,23 +3,16 @@ package im.angry.openeuicc
 import android.app.Application
 import android.telephony.SubscriptionManager
 import android.telephony.TelephonyManager
-import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.core.BaseEuiccChannelManager
 
-class OpenEuiccApplication : Application() {
+abstract class BaseOpenEuiccApplication : Application() {
     val telephonyManager by lazy {
         getSystemService(TelephonyManager::class.java)!!
     }
 
-    val euiccChannelManager by lazy {
-        EuiccChannelManager(this)
-    }
+    abstract val euiccChannelManager: BaseEuiccChannelManager
 
     val subscriptionManager by lazy {
         getSystemService(SubscriptionManager::class.java)!!
     }
-
-    override fun onCreate() {
-        super.onCreate()
-        euiccChannelManager.closeAllStaleChannels()
-    }
 }
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt b/app-common/src/main/java/im/angry/openeuicc/core/BaseEuiccChannelManager.kt
similarity index 69%
rename from app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt
rename to app-common/src/main/java/im/angry/openeuicc/core/BaseEuiccChannelManager.kt
index 27ff301..2b89b4c 100644
--- a/app-common/src/main/java/im/angry/openeuicc/core/EuiccChannelManager.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/core/BaseEuiccChannelManager.kt
@@ -6,21 +6,19 @@ import android.os.HandlerThread
 import android.se.omapi.SEService
 import android.telephony.UiccCardInfo
 import android.util.Log
-import im.angry.openeuicc.OpenEuiccApplication
-import im.angry.openeuicc.util.*
+import im.angry.openeuicc.BaseOpenEuiccApplication
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.withContext
-import java.lang.Exception
 import java.lang.IllegalArgumentException
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
-class EuiccChannelManager(private val context: Context) {
+abstract class BaseEuiccChannelManager(private val context: Context) {
     companion object {
-        const val TAG = "EuiccChannelManager"
+        const val TAG = "BaseEuiccChannelManager"
     }
 
     private val channels = mutableListOf<EuiccChannel>()
@@ -29,11 +27,11 @@ class EuiccChannelManager(private val context: Context) {
 
     private val lock = Mutex()
 
-    private val tm by lazy {
-        (context.applicationContext as OpenEuiccApplication).telephonyManager
+    protected val tm by lazy {
+        (context.applicationContext as BaseOpenEuiccApplication).telephonyManager
     }
 
-    private val handler = Handler(HandlerThread("EuiccChannelManager").also { it.start() }.looper)
+    private val handler = Handler(HandlerThread("BaseEuiccChannelManager").also { it.start() }.looper)
 
     private suspend fun connectSEService(): SEService = suspendCoroutine { cont ->
         handler.post {
@@ -50,6 +48,8 @@ class EuiccChannelManager(private val context: Context) {
          }
     }
 
+    abstract fun tryOpenEuiccChannelPrivileged(uiccInfo: UiccCardInfo, channelInfo: EuiccChannelInfo): EuiccChannel?
+
     private suspend fun tryOpenEuiccChannel(uiccInfo: UiccCardInfo): EuiccChannel? {
         lock.withLock {
             ensureSEService()
@@ -71,17 +71,7 @@ class EuiccChannelManager(private val context: Context) {
                 uiccInfo.isRemovable
             )
 
-            var euiccChannel: EuiccChannel? = null
-
-            if (uiccInfo.isEuicc && !uiccInfo.isRemovable) {
-                Log.d(TAG, "Using TelephonyManager for slot ${uiccInfo.slotIndex}")
-                // TODO: On Tiramisu, we should also connect all available "ports" for MEP support
-                try {
-                    euiccChannel = TelephonyManagerChannel(channelInfo, tm)
-                } catch (e: IllegalArgumentException) {
-                    // Failed
-                }
-            }
+            var euiccChannel: EuiccChannel? = tryOpenEuiccChannelPrivileged(uiccInfo, channelInfo)
 
             if (euiccChannel == null) {
                 try {
@@ -135,19 +125,4 @@ class EuiccChannelManager(private val context: Context) {
         seService?.shutdown()
         seService = null
     }
-
-    // Clean up channels left open in TelephonyManager
-    // due to a (potentially) forced restart
-    // This should be called every time the application is restarted
-    fun closeAllStaleChannels() {
-        for (card in tm.uiccCardsInfo) {
-            for (channel in 0 until 10) {
-                try {
-                    tm.iccCloseLogicalChannelBySlot(card.slotIndex, channel)
-                } catch (_: Exception) {
-                    // We do not care
-                }
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
index 1201d60..2d8d687 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/EuiccChannelFragmentUtils.kt
@@ -2,8 +2,8 @@ package im.angry.openeuicc.ui
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
+import im.angry.openeuicc.core.BaseEuiccChannelManager
 import im.angry.openeuicc.core.EuiccChannel
-import im.angry.openeuicc.core.EuiccChannelManager
 import im.angry.openeuicc.util.openEuiccApplication
 
 interface EuiccFragmentMarker
@@ -19,7 +19,7 @@ fun <T> newInstanceEuicc(clazz: Class<T>, slotId: Int): T where T: Fragment, T:
 val <T> T.slotId: Int where T: Fragment, T: EuiccFragmentMarker
     get() = requireArguments().getInt("slotId")
 
-val <T> T.euiccChannelManager: EuiccChannelManager where T: Fragment, T: EuiccFragmentMarker
+val <T> T.euiccChannelManager: BaseEuiccChannelManager where T: Fragment, T: EuiccFragmentMarker
     get() = openEuiccApplication.euiccChannelManager
 
 val <T> T.channel: EuiccChannel where T: Fragment, T: EuiccFragmentMarker
diff --git a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
index 8eb7092..6ea0a15 100644
--- a/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
@@ -13,7 +13,7 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.lifecycleScope
 import im.angry.openeuicc.common.R
-import im.angry.openeuicc.core.EuiccChannelManager
+import im.angry.openeuicc.core.BaseEuiccChannelManager
 import im.angry.openeuicc.util.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -24,7 +24,7 @@ class MainActivity : AppCompatActivity() {
         const val TAG = "MainActivity"
     }
 
-    private lateinit var manager: EuiccChannelManager
+    private lateinit var manager: BaseEuiccChannelManager
 
     private lateinit var spinnerAdapter: ArrayAdapter<String>
     private lateinit var spinner: Spinner
diff --git a/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt b/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt
index 477837f..b39b78f 100644
--- a/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt
+++ b/app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt
@@ -6,12 +6,12 @@ import android.graphics.Rect
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.Fragment
-import im.angry.openeuicc.OpenEuiccApplication
+import im.angry.openeuicc.BaseOpenEuiccApplication
 
-val Activity.openEuiccApplication: OpenEuiccApplication
-    get() = application as OpenEuiccApplication
+val Activity.openEuiccApplication: BaseOpenEuiccApplication
+    get() = application as BaseOpenEuiccApplication
 
-val Fragment.openEuiccApplication: OpenEuiccApplication
+val Fragment.openEuiccApplication: BaseOpenEuiccApplication
     get() = requireActivity().openEuiccApplication
 
 // Source: <https://stackoverflow.com/questions/12478520/how-to-set-dialogfragments-width-and-height>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ffc6cf..cdbb508 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,7 +5,7 @@
     package="im.angry.openeuicc">
 
     <application
-        android:name=".OpenEuiccApplication"
+        android:name=".PrivilegedOpenEuiccApplication"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
diff --git a/app/src/main/java/im/angry/openeuicc/PrivilegedOpenEuiccApplication.kt b/app/src/main/java/im/angry/openeuicc/PrivilegedOpenEuiccApplication.kt
new file mode 100644
index 0000000..f63f98e
--- /dev/null
+++ b/app/src/main/java/im/angry/openeuicc/PrivilegedOpenEuiccApplication.kt
@@ -0,0 +1,15 @@
+package im.angry.openeuicc
+
+import im.angry.openeuicc.core.BaseEuiccChannelManager
+import im.angry.openeuicc.core.PrivilegedEuiccChannelManager
+
+class PrivilegedOpenEuiccApplication: BaseOpenEuiccApplication() {
+    override val euiccChannelManager: BaseEuiccChannelManager by lazy {
+        PrivilegedEuiccChannelManager(this)
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        (euiccChannelManager as PrivilegedEuiccChannelManager).closeAllStaleChannels()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManager.kt b/app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManager.kt
new file mode 100644
index 0000000..d40d151
--- /dev/null
+++ b/app/src/main/java/im/angry/openeuicc/core/PrivilegedEuiccChannelManager.kt
@@ -0,0 +1,38 @@
+package im.angry.openeuicc.core
+
+import android.content.Context
+import android.telephony.UiccCardInfo
+import android.util.Log
+import im.angry.openeuicc.util.*
+import java.lang.Exception
+import java.lang.IllegalArgumentException
+
+class PrivilegedEuiccChannelManager(context: Context): BaseEuiccChannelManager(context) {
+    override fun tryOpenEuiccChannelPrivileged(uiccInfo: UiccCardInfo, channelInfo: EuiccChannelInfo): EuiccChannel? {
+        if (uiccInfo.isEuicc && !uiccInfo.isRemovable) {
+            Log.d(TAG, "Using TelephonyManager for slot ${uiccInfo.slotIndex}")
+            // TODO: On Tiramisu, we should also connect all available "ports" for MEP support
+            try {
+                return TelephonyManagerChannel(channelInfo, tm)
+            } catch (e: IllegalArgumentException) {
+                // Failed
+            }
+        }
+        return null
+    }
+
+    // Clean up channels left open in TelephonyManager
+    // due to a (potentially) forced restart
+    // This should be called every time the application is restarted
+    fun closeAllStaleChannels() {
+        for (card in tm.uiccCardsInfo) {
+            for (channel in 0 until 10) {
+                try {
+                    tm.iccCloseLogicalChannelBySlot(card.slotIndex, channel)
+                } catch (_: Exception) {
+                    // We do not care
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app-common/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt b/app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
similarity index 100%
rename from app-common/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
rename to app/src/main/java/im/angry/openeuicc/core/TelephonyManagerApduInterface.kt
diff --git a/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt b/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt
index 4824fbd..211a863 100644
--- a/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt
+++ b/app/src/main/java/im/angry/openeuicc/service/OpenEuiccService.kt
@@ -4,13 +4,13 @@ import android.service.euicc.*
 import android.telephony.euicc.DownloadableSubscription
 import android.telephony.euicc.EuiccInfo
 import net.typeblog.lpac_jni.LocalProfileInfo
-import im.angry.openeuicc.OpenEuiccApplication
+import im.angry.openeuicc.BaseOpenEuiccApplication
 import im.angry.openeuicc.core.EuiccChannel
 import im.angry.openeuicc.util.*
 
 class OpenEuiccService : EuiccService() {
     private val openEuiccApplication
-        get() = application as OpenEuiccApplication
+        get() = application as BaseOpenEuiccApplication
 
     private fun findChannel(slotId: Int): EuiccChannel? =
         openEuiccApplication.euiccChannelManager