diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0e4c1b7..2008b36 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -9,7 +9,6 @@
-
diff --git a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt b/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
index 7b90f54..5551219 100644
--- a/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
+++ b/app/src/main/java/im/angry/openeuicc/ui/MainActivity.kt
@@ -1,23 +1,18 @@
package im.angry.openeuicc.ui
import android.os.Bundle
-import android.telephony.TelephonyManager
import android.util.Log
import android.view.Menu
-import android.view.MenuItem
import android.view.View
import android.widget.AdapterView
import android.widget.ArrayAdapter
import android.widget.Spinner
-import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.lifecycleScope
import im.angry.openeuicc.OpenEUICCApplication
import im.angry.openeuicc.R
import im.angry.openeuicc.core.EuiccChannelRepository
import im.angry.openeuicc.databinding.ActivityMainBinding
-import im.angry.openeuicc.util.dsdsEnabled
-import im.angry.openeuicc.util.supportsDSDS
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
@@ -36,15 +31,11 @@ class MainActivity : AppCompatActivity() {
private lateinit var binding: ActivityMainBinding
- private lateinit var tm: TelephonyManager
-
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityMainBinding.inflate(layoutInflater)
setContentView(binding.root)
- tm = getSystemService(TelephonyManager::class.java)
-
repo = (application as OpenEUICCApplication).euiccChannelRepo
spinnerAdapter = ArrayAdapter(this, android.R.layout.simple_spinner_item)
@@ -55,7 +46,7 @@ class MainActivity : AppCompatActivity() {
}
override fun onCreateOptionsMenu(menu: Menu): Boolean {
- menuInflater.inflate(R.menu.activity_main, menu)
+ menuInflater.inflate(R.menu.activity_main_slot_spinner, menu)
spinner = menu.findItem(R.id.spinner).actionView as Spinner
spinner.adapter = spinnerAdapter
@@ -74,25 +65,9 @@ class MainActivity : AppCompatActivity() {
}
- if (tm.supportsDSDS) {
- val dsds = menu.findItem(R.id.dsds)
- dsds.isVisible = true
- dsds.isChecked = tm.dsdsEnabled
- }
-
return true
}
- override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) {
- R.id.dsds -> {
- tm.dsdsEnabled = !item.isChecked
- Toast.makeText(this, R.string.toast_dsds_switched, Toast.LENGTH_LONG).show()
- finish()
- true
- }
- else -> false
- }
-
private suspend fun init() {
withContext(Dispatchers.IO) {
repo.load()
diff --git a/app/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt b/app/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt
deleted file mode 100644
index a1ae2d1..0000000
--- a/app/src/main/java/im/angry/openeuicc/util/TelephonyUtils.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package im.angry.openeuicc.util
-
-import android.telephony.TelephonyManager
-
-val TelephonyManager.supportsDSDS: Boolean
- get() = supportedModemCount == 2
-
-var TelephonyManager.dsdsEnabled: Boolean
- get() = activeModemCount >= 2
- set(value) {
- switchMultiSimConfig(if (value) { 2 } else {1})
- }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 861e481..218c685 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -18,9 +18,6 @@
android:id="@+id/no_euicc_placeholder"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginStart="40dp"
- android:layout_marginEnd="40dp"
- android:gravity="center"
android:text="@string/no_euicc" />
diff --git a/app/src/main/res/menu/activity_main.xml b/app/src/main/res/menu/activity_main_slot_spinner.xml
similarity index 68%
rename from app/src/main/res/menu/activity_main.xml
rename to app/src/main/res/menu/activity_main_slot_spinner.xml
index 7386e70..9d1f42c 100644
--- a/app/src/main/res/menu/activity_main.xml
+++ b/app/src/main/res/menu/activity_main_slot_spinner.xml
@@ -7,11 +7,4 @@
app:actionViewClass="android.widget.Spinner"
android:background="?android:attr/colorPrimary"
app:showAsAction="always" />
-
-