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

@@ -137,7 +137,7 @@ class EuiccInfoActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker {
         add(
             Item(
                 R.string.euicc_info_atr,
-                channel.atr?.encodeHex() ?: getString(R.string.information_unavailable),
+                channel.atr?.encodeHex() ?: getString(R.string.unavailable),
                 copiedToastResId = R.string.toast_atr_copied,
             )
         )

app-common/src/main/res/values-ja/strings.xml

@@ -3,7 +3,6 @@
     <string name="no_euicc">このアプリでアクセスできるリムーバブル eUICC カードがデバイス上で検出されていません。互換性のあるカード挿入または USB リーダーを接続してください。</string>
     <string name="no_profile">この eSIM にはプロファイルがありません。</string>
     <string name="unknown">不明</string>
-    <string name="information_unavailable">情報なし</string>
     <string name="help">ヘルプ</string>
     <string name="reload">スロットを再読み込み</string>
     <string name="channel_name_format">論理スロット %d</string>
@@ -20,7 +19,6 @@
     <string name="toast_profile_delete_confirm_text_mismatched">入力した確認用テキストは一致していません</string>
     <string name="toast_iccid_copied">ICCID をクリップボードにコピーしました</string>
     <string name="toast_eid_copied">EID をクリップボードにコピーしました</string>
-    <string name="toast_atr_copied">ATR をクリップボードにコピーしました</string>
     <string name="usb_permission">USB の権限を許可</string>
     <string name="usb_permission_needed">USB スマートカードリーダーにアクセスするには許可が必要です。</string>
     <string name="usb_failed">USB スマートカードリーダー経由で eSIM に接続できません。</string>
@@ -46,7 +44,6 @@
     <string name="download_wizard">ダウンロードウィザード</string>
     <string name="download_wizard_back">戻る</string>
     <string name="download_wizard_next">次へ</string>
-    <string name="download_wizard_slot_removed">選択された SIM が取り外されました</string>
     <string name="download_wizard_slot_select">ダウンロードする eSIM を選択または確認:</string>
     <string name="download_wizard_slot_type">タイプ:</string>
     <string name="download_wizard_slot_type_removable">リムーバブル</string>
@@ -98,7 +95,6 @@
     <string name="euicc_info_activity_title">eUICC 情報 (%s)</string>
     <string name="euicc_info_access_mode">アクセスモード</string>
     <string name="euicc_info_removable">リムーバブル</string>
-    <string name="euicc_info_sgp22_version">SGP.22 バージョン</string>
     <string name="euicc_info_firmware_version">eUICC OS のバージョン</string>
     <string name="euicc_info_globalplatform_version">グローバルプラットフォームのバージョン</string>
     <string name="euicc_info_sas_accreditation_number">SAS 認定番号</string>

app-common/src/main/res/values-zh-rCN/strings.xml

@@ -20,7 +20,6 @@
     <string name="toast_profile_delete_confirm_text_mismatched">输入的确认文本不匹配</string>
     <string name="toast_iccid_copied">已复制 ICCID 到剪贴板</string>
     <string name="toast_eid_copied">已复制 EID 到剪贴板</string>
-    <string name="toast_atr_copied">已复制 ATR 到剪贴板</string>
     <string name="usb_permission">授予 USB 权限</string>
     <string name="usb_permission_needed">需要获得访问 USB 智能卡读卡器的权限。</string>
     <string name="usb_failed">无法通过 USB 智能卡读卡器连接到 eSIM。</string>
@@ -87,7 +86,6 @@
     <string name="download_wizard">下载向导</string>
     <string name="download_wizard_back">返回</string>
     <string name="download_wizard_next">下一步</string>
-    <string name="download_wizard_slot_removed">您选择的 SIM 已被移除</string>
     <string name="download_wizard_slot_select">请选择或确认下载目标 eSIM 卡槽:</string>
     <string name="download_wizard_slot_type">类型:</string>
     <string name="download_wizard_slot_type_removable">可插拔</string>
@@ -122,7 +120,6 @@
     <string name="euicc_info_activity_title">eUICC 详情 (%s)</string>
     <string name="euicc_info_access_mode">访问方式</string>
     <string name="euicc_info_removable">可插拔</string>
-    <string name="euicc_info_sgp22_version">SGP.22 版本</string>
     <string name="euicc_info_firmware_version">eUICC OS 版本</string>
     <string name="euicc_info_globalplatform_version">GlobalPlatform 版本</string>
     <string name="euicc_info_sas_accreditation_number">SAS 认证号码</string>
@@ -143,5 +140,4 @@
     <string name="pref_developer_unfiltered_profile_list_desc">在配置文件列表中包括非生产环境的配置文件</string>
     <string name="pref_developer_ignore_tls_certificate">无视 SM-DP+ 的 TLS 证书</string>
     <string name="pref_developer_ignore_tls_certificate_desc">允许 RSP 服务器使用任意证书</string>
-    <string name="information_unavailable">无信息</string>
 </resources>

app-common/src/main/res/values/strings.xml

@@ -3,7 +3,7 @@
     <string name="no_euicc">No removable eUICC card accessible by this app is detected on this device. Insert a compatible card or a USB reader.</string>
     <string name="no_profile">No profiles (yet) on this eSIM.</string>
     <string name="unknown">Unknown</string>
-    <string name="information_unavailable">Information Unavailable</string>
+    <string name="unavailable">Unavailable</string>
     <string name="help">Help</string>
     <string name="reload">Reload Slots</string>
 

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

@@ -1,14 +1,9 @@
 package im.angry.openeuicc.di
 
-import androidx.fragment.app.Fragment
 import im.angry.openeuicc.ui.EuiccManagementFragment
 import im.angry.openeuicc.ui.PrivilegedEuiccManagementFragment
-import im.angry.openeuicc.ui.PrivilegedSettingsFragment
 
 class PrivilegedUiComponentFactory : DefaultUiComponentFactory() {
     override fun createEuiccManagementFragment(slotId: Int, portId: Int): EuiccManagementFragment =
         PrivilegedEuiccManagementFragment.newInstance(slotId, portId)
-
-    override fun createSettingsFragment(): Fragment =
-        PrivilegedSettingsFragment()
 }

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

@@ -1,17 +0,0 @@
-package im.angry.openeuicc.ui
-
-import android.os.Bundle
-import androidx.preference.Preference
-
-class PrivilegedSettingsFragment : SettingsFragment() {
-    override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        super.onCreatePreferences(savedInstanceState, rootKey)
-        // It's stupid to _disable_ things for privileged, but for now, the per-app locale picker
-        // is not usable for apps signed with the platform key.
-        // ref: <https://android.googlesource.com/platform/packages/apps/Settings/+/refs/tags/android-15.0.0_r6/src/com/android/settings/applications/AppLocaleUtil.java#60>
-        // This is disabled here, not moved to unprivileged, because I have hope that this will
-        // eventually work for platform-signed apps. Or, at some point we might introduce our own
-        // locale picker, which hopefully works whether privileged or not.
-        requirePreference<Preference>("pref_advanced_language").isVisible = false
-    }
-}