From b4d11291f130923b9bfff4fd75c168f3b3c92a0f Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Fri, 9 Sep 2022 13:55:42 +0200
Subject: [PATCH] Added @StringRes annotation when useful

---
 .../main/java/org/linphone/activities/SnackBarActivity.kt | 6 ++++--
 .../linphone/activities/assistant/AssistantActivity.kt    | 5 +++--
 .../java/org/linphone/activities/main/MainActivity.kt     | 8 +++++---
 .../java/org/linphone/compatibility/Api26Compatibility.kt | 3 ++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/SnackBarActivity.kt b/app/src/main/java/org/linphone/activities/SnackBarActivity.kt
index b28d8e5d4..c9995d68c 100644
--- a/app/src/main/java/org/linphone/activities/SnackBarActivity.kt
+++ b/app/src/main/java/org/linphone/activities/SnackBarActivity.kt
@@ -19,8 +19,10 @@
  */
 package org.linphone.activities
 
+import androidx.annotation.StringRes
+
 interface SnackBarActivity {
-    fun showSnackBar(resourceId: Int)
-    fun showSnackBar(resourceId: Int, action: Int, listener: () -> Unit)
+    fun showSnackBar(@StringRes resourceId: Int)
+    fun showSnackBar(@StringRes resourceId: Int, action: Int, listener: () -> Unit)
     fun showSnackBar(message: String)
 }
diff --git a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt b/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt
index 52fd813f9..1b1b8321e 100644
--- a/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt
+++ b/app/src/main/java/org/linphone/activities/assistant/AssistantActivity.kt
@@ -20,6 +20,7 @@
 package org.linphone.activities.assistant
 
 import android.os.Bundle
+import androidx.annotation.StringRes
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.snackbar.Snackbar
@@ -45,11 +46,11 @@ class AssistantActivity : GenericActivity(), SnackBarActivity {
         corePreferences.firstStart = false
     }
 
-    override fun showSnackBar(resourceId: Int) {
+    override fun showSnackBar(@StringRes resourceId: Int) {
         Snackbar.make(coordinator, resourceId, Snackbar.LENGTH_LONG).show()
     }
 
-    override fun showSnackBar(resourceId: Int, action: Int, listener: () -> Unit) {
+    override fun showSnackBar(@StringRes resourceId: Int, action: Int, listener: () -> Unit) {
         Snackbar
             .make(findViewById(R.id.coordinator), resourceId, Snackbar.LENGTH_LONG)
             .setAction(action) {
diff --git a/app/src/main/java/org/linphone/activities/main/MainActivity.kt b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
index faf9d79e2..1ee1908b7 100644
--- a/app/src/main/java/org/linphone/activities/main/MainActivity.kt
+++ b/app/src/main/java/org/linphone/activities/main/MainActivity.kt
@@ -28,6 +28,7 @@ import android.os.Parcelable
 import android.view.Gravity
 import android.view.MotionEvent
 import android.view.View
+import androidx.annotation.StringRes
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
@@ -109,7 +110,8 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val splashScreen = installSplashScreen()
+        // Must be done before the setContentView
+        installSplashScreen()
 
         binding = DataBindingUtil.setContentView(this, R.layout.main_activity)
         binding.lifecycleOwner = this
@@ -175,11 +177,11 @@ class MainActivity : GenericActivity(), SnackBarActivity, NavController.OnDestin
         super.onPause()
     }
 
-    override fun showSnackBar(resourceId: Int) {
+    override fun showSnackBar(@StringRes resourceId: Int) {
         Snackbar.make(findViewById(R.id.coordinator), resourceId, Snackbar.LENGTH_LONG).show()
     }
 
-    override fun showSnackBar(resourceId: Int, action: Int, listener: () -> Unit) {
+    override fun showSnackBar(@StringRes resourceId: Int, action: Int, listener: () -> Unit) {
         Snackbar
             .make(findViewById(R.id.coordinator), resourceId, Snackbar.LENGTH_LONG)
             .setAction(action) {
diff --git a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
index 735582e1d..5f5e4796c 100644
--- a/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api26Compatibility.kt
@@ -34,6 +34,7 @@ import android.os.Vibrator
 import android.view.WindowManager
 import android.view.inputmethod.EditorInfo
 import android.widget.RemoteViews
+import androidx.annotation.StringRes
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.Person
@@ -228,7 +229,7 @@ class Api26Compatibility {
             channel: String,
             notificationsManager: NotificationsManager
         ): Notification {
-            val stringResourceId: Int
+            @StringRes val stringResourceId: Int
             val iconResourceId: Int
             val roundPicture: Bitmap?
             val title: String