From 4aae1f78d8a84e233040e57e04f71ab7d5045d85 Mon Sep 17 00:00:00 2001
From: Valere <valeref@matrix.org>
Date: Mon, 8 Jul 2019 18:05:37 +0200
Subject: [PATCH] moved new strings + @StringRes annotation

---
 .../android/api/session/InitialSyncProgressService.kt  |  3 ++-
 matrix-sdk-android/src/main/res/values/strings.xml     |  9 ---------
 .../src/main/res/values/strings_RiotX.xml              | 10 ++++++++++
 3 files changed, 12 insertions(+), 10 deletions(-)
 create mode 100644 matrix-sdk-android/src/main/res/values/strings_RiotX.xml

diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
index 619d9356a5..ce84212598 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
@@ -1,5 +1,6 @@
 package im.vector.matrix.android.api.session
 
+import androidx.annotation.StringRes
 import androidx.lifecycle.LiveData
 
 interface InitialSyncProgressService {
@@ -7,7 +8,7 @@ interface InitialSyncProgressService {
     fun getLiveStatus() : LiveData<Status?>
 
     data class Status(
-            val statusText: Int?,
+            @StringRes val statusText: Int?,
             val percentProgress: Int = 0
     )
 }
\ No newline at end of file
diff --git a/matrix-sdk-android/src/main/res/values/strings.xml b/matrix-sdk-android/src/main/res/values/strings.xml
index eb39b689dc..be64a65974 100644
--- a/matrix-sdk-android/src/main/res/values/strings.xml
+++ b/matrix-sdk-android/src/main/res/values/strings.xml
@@ -228,13 +228,4 @@
     <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
     <string name="verification_emoji_pin">Pin</string>
 
-
-    <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
-    <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
-    <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
-    <string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
-    <string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
-    <string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
-    <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
-    <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
 </resources>
diff --git a/matrix-sdk-android/src/main/res/values/strings_RiotX.xml b/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
new file mode 100644
index 0000000000..d03dfa79b9
--- /dev/null
+++ b/matrix-sdk-android/src/main/res/values/strings_RiotX.xml
@@ -0,0 +1,10 @@
+<resources>
+    <string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
+    <string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
+    <string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
+    <string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
+    <string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
+    <string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
+    <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
+    <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
+</resources>
\ No newline at end of file