Delete bunch of unused strings - WIP

vector/build.gradle

@@ -132,16 +132,9 @@ android {
         versionName "${versionMajor}.${versionMinor}.${versionPatch}-sonar"
 
         buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
-        resValue "string", "git_revision", "\"${gitRevision()}\""
-
         buildConfigField "String", "GIT_REVISION_DATE", "\"${gitRevisionDate()}\""
-        resValue "string", "git_revision_date", "\"${gitRevisionDate()}\""
-
         buildConfigField "String", "GIT_BRANCH_NAME", "\"${gitBranchName()}\""
-        resValue "string", "git_branch_name", "\"${gitBranchName()}\""
-
         buildConfigField "String", "BUILD_NUMBER", "\"${buildNumber}\""
-        resValue "string", "build_number", "\"${buildNumber}\""
 
         buildConfigField "im.vector.app.features.VectorFeatures.OnboardingVariant", "ONBOARDING_VARIANT", "im.vector.app.features.VectorFeatures.OnboardingVariant.FTUE_AUTH"
 
@@ -233,7 +226,6 @@ android {
             applicationIdSuffix ".debug"
             resValue "string", "app_name", "Element dbg"
 
-            resValue "bool", "debug_mode", "true"
             buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
             // Set to true if you want to enable strict mode in debug
             buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
@@ -244,7 +236,6 @@ android {
         release {
             resValue "string", "app_name", "Element"
 
-            resValue "bool", "debug_mode", "false"
             buildConfigField "boolean", "LOW_PRIVACY_LOG_ENABLE", "false"
             buildConfigField "boolean", "ENABLE_STRICT_MODE_LOGS", "false"
 

vector/lint.xml

@@ -14,6 +14,39 @@
     <issue id="IconExpectedSize" severity="error" />
     <issue id="LocaleFolder" severity="error" />
 
+    <!-- String resource has to be used, for the rest we can ignore for now
+    TODO: stop ignoring warning at all those locations -->
+    <issue id="UnusedResources" severity="error">
+        <ignore path="**/build.gradle" />
+        <ignore path="**/anim/**" />
+        <ignore path="**/color/**" />
+        <ignore path="**/drawable*/**" />
+        <ignore path="**/layout/**" />
+        <ignore path="**/menu/**" />
+        <ignore path="**/raw/**" />
+        <ignore path="**/values/dimens.xml" />
+        <ignore path="**/values/colors.xml" />
+        <ignore path="**/values/palette.xml" />
+        <ignore path="**/values/palette_mobile.xml" />
+        <ignore path="**/values/donottranslate.xml" />
+        <ignore path="**/values/strings_login_v2.xml" />
+        <ignore path="**/library/ui-styles/src/main/res/values/**" />
+        <ignore path="**/xml/**" />
+
+        <!-- Following resources are for F-Droid variant only, so ignore for GPlay -->
+        <ignore regexp="settings_troubleshoot_test_service_boot_*" />
+        <ignore regexp="settings_troubleshoot_test_bg_restricted_*" />
+        <ignore regexp="settings_troubleshoot_test_battery_*" />
+
+        <!-- Following resources are for GPlay variant only, so ignore for F-Droid -->
+        <ignore regexp="settings_troubleshoot_test_play_services_" />
+        <ignore regexp="settings_troubleshoot_test_push_loop_" />
+        <ignore regexp="settings_troubleshoot_test_token_registration_" />
+        <ignore regexp="settings_troubleshoot_test_fcm_" />
+        <ignore regexp="no_valid_google_play_services_apk" />
+        <ignore regexp="sas_error_unknown" />
+    </issue>
+
     <!-- UX -->
     <issue id="ButtonOrder" severity="error" />
     <issue id="TextFields" severity="error" />

vector/src/main/java/im/vector/app/features/rageshake/BugReporter.kt

@@ -271,7 +271,7 @@ class BugReporter @Inject constructor(
                             .addFormDataPart("can_contact", canContact.toString())
                             .addFormDataPart("device_id", deviceId)
                             .addFormDataPart("version", versionProvider.getVersion(longFormat = true, useBuildNumber = false))
-                            .addFormDataPart("branch_name", context.getString(R.string.git_branch_name))
+                            .addFormDataPart("branch_name", BuildConfig.GIT_BRANCH_NAME)
                             .addFormDataPart("matrix_sdk_version", Matrix.getSdkVersion())
                             .addFormDataPart("olm_version", olmVersion)
                             .addFormDataPart("device", Build.MODEL.trim())
@@ -289,7 +289,7 @@ class BugReporter @Inject constructor(
                                 }
                             }
 
-                    val buildNumber = context.getString(R.string.build_number)
+                    val buildNumber = BuildConfig.BUILD_NUMBER
                     if (buildNumber.isNotEmpty() && buildNumber != "0") {
                         builder.addFormDataPart("build_number", buildNumber)
                     }
@@ -329,7 +329,7 @@ class BugReporter @Inject constructor(
                     // add some github labels
                     builder.addFormDataPart("label", BuildConfig.VERSION_NAME)
                     builder.addFormDataPart("label", BuildConfig.FLAVOR_DESCRIPTION)
-                    builder.addFormDataPart("label", context.getString(R.string.git_branch_name))
+                    builder.addFormDataPart("label", BuildConfig.GIT_BRANCH_NAME)
 
                     // Special for Element
                     builder.addFormDataPart("label", "[Element]")

vector/src/main/res/layout/composer_layout.xml

@@ -109,7 +109,7 @@
         android:layout_height="wrap_content"
         android:nextFocusLeft="@id/composerEditText"
         android:nextFocusUp="@id/composerEditText"
-        tools:hint="@string/room_message_placeholder_not_encrypted"
+        tools:hint="@string/room_message_placeholder"
         tools:ignore="MissingConstraints" />
 
     <ImageButton

vector/src/main/res/layout/composer_layout_constraint_set_compact.xml

@@ -138,7 +138,7 @@
         style="@style/Widget.Vector.EditText.Composer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/room_message_placeholder_not_encrypted"
+        android:hint="@string/room_message_placeholder"
         android:nextFocusLeft="@id/composerEditText"
         android:nextFocusUp="@id/composerEditText"
         app:layout_constraintBottom_toBottomOf="parent"