From ee5ca2d05632ce72f4314f45952269683a2cb1ad Mon Sep 17 00:00:00 2001
From: Alexander Koskovich <akoskovich@pm.me>
Date: Tue, 2 Jan 2024 15:46:41 -0500
Subject: [PATCH] Fix string errors when compiling in AOSP

When you have multiple placeholders in a string you should use
positional arguments.

Change-Id: Ie1197735b44e1b702418caeaebac0191de18d1e9
---
 app-common/src/main/res/values/strings.xml | 2 +-
 app/src/main/res/values/strings.xml        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app-common/src/main/res/values/strings.xml b/app-common/src/main/res/values/strings.xml
index 1767c08..4916084 100644
--- a/app-common/src/main/res/values/strings.xml
+++ b/app-common/src/main/res/values/strings.xml
@@ -40,7 +40,7 @@
     <string name="profile_notification_operation_delete">Deleted</string>
     <string name="profile_notification_operation_enable">Enabled</string>
     <string name="profile_notification_operation_disable">Disabled</string>
-    <string name="profile_notification_name_format">&lt;b&gt;%s&lt;/b&gt; %s (%s)</string>
+    <string name="profile_notification_name_format">&lt;b&gt;%1$s&lt;/b&gt; %2$s (%3$s)</string>
     <string name="profile_notification_process">Process</string>
     <string name="profile_notification_delete">Delete</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8c2b337..beac27e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,9 +10,9 @@
 
     <string name="slot_mapping">Slot Mapping</string>
     <string name="slot_mapping_logical_slot">Logical slot %d:</string>
-    <string name="slot_mapping_port">Slot %d Port %d</string>
-    <string name="slot_mapping_help">Your phone has %d logical and %d physical SIM slots.%s\n\nSelect which physical slot and/or \"port\" you want each logical slot to correspond to. Note that not all mapping modes may be supported by hardware.</string>
-    <string name="slot_mapping_help_mep">\n\nPhysical slot %d supports Multiple Enabled Profiles (MEP). To use this feature, assign its %d virtual \"ports\" to different logical slots shown above.\n\nWith MEP enabled, the \"ports\" will behave like separate eSIM slots in OpenEUICC, except with a shared profile list.</string>
+    <string name="slot_mapping_port">Slot %1$d Port %2$d</string>
+    <string name="slot_mapping_help">Your phone has %1$d logical and %2$d physical SIM slots.%3$s\n\nSelect which physical slot and/or \"port\" you want each logical slot to correspond to. Note that not all mapping modes may be supported by hardware.</string>
+    <string name="slot_mapping_help_mep">\n\nPhysical slot %1$d supports Multiple Enabled Profiles (MEP). To use this feature, assign its %2$d virtual \"ports\" to different logical slots shown above.\n\nWith MEP enabled, the \"ports\" will behave like separate eSIM slots in OpenEUICC, except with a shared profile list.</string>
     <string name="slot_mapping_help_dsds">\nDual SIM mode is supported but disabled. If your device comes with an internal eSIM chip, it might not be enabled by default. Change mapping above or enable dual SIM to access your eSIM.</string>
     <string name="slot_mapping_completed">Your new slot mapping has been set. Please wait until modem refreshes the slots.</string>
     <string name="slot_mapping_failure">The specified mapping might be invalid or unsupported by hardware.</string>