Merge pull request #1110 from vector-im/feature/cleanup

Cleanup

matrix-sdk-android/src/main/res/layout/adapter_item_icon_and_text.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp">
-
-    <ImageView
-        android:id="@+id/imageView_icon_and_text"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
-        android:src="@drawable/matrix_user" />
-
-    <TextView
-        android:id="@+id/textView_icon_and_text"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingLeft="8dp"
-        android:paddingRight="8dp"
-        android:singleLine="true"
-        android:textColor="@android:color/white"
-        tools:text="A text here" />
-
-</LinearLayout>

matrix-sdk-android/src/main/res/layout/fragment_dialog_icon_text_list.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <ListView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/listView_icon_and_text"/>
-
-</LinearLayout>

matrix-sdk-android/src/main/res/layout/fragment_matrix_message_list_fragment.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:background="#248801">
-
-    <org.matrix.androidsdk.view.AutoScrollDownListView
-        android:id="@+id/listView_messages"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:background="#190986"
-        android:cacheColorHint="@android:color/transparent"
-        android:childDivider="@android:color/transparent"
-        android:divider="#ffffff"
-        android:dividerHeight="0dp"
-        android:listSelector="@android:color/transparent"
-        android:transcriptMode="normal"
-        tools:layout_height="120dp" />
-
-</FrameLayout>

matrix-sdk-android/src/main/res/values/dimens.xml

@@ -1,3 +0,0 @@
-<resources>
-
-</resources>

vector/lint.xml

@@ -14,6 +14,7 @@
 
     <!-- UX -->
     <issue id="ButtonOrder" severity="error" />
+    <issue id="TextFields" severity="error" />
 
     <!-- Layout -->
     <issue id="UnknownIdInLayout" severity="error" />
@@ -46,4 +47,11 @@
 
     <!-- Manifest -->
     <issue id="PermissionImpliesUnsupportedChromeOsHardware" severity="error" />
+
+    <!-- Timber -->
+    <issue id="BinaryOperationInTimber" severity="error" />
+
+    <!-- Wording -->
+    <!-- TODO When strings are imported from Weblate, move this to error -->
+    <issue id="Typos" severity="warning" />
 </lint>

vector/src/debug/java/im/vector/riotx/features/debug/DebugMenuActivity.kt

@@ -114,7 +114,7 @@ class DebugMenuActivity : VectorBaseActivity() {
                 .setContentText("Content")
                 // No effect because it's a group summary notif
                 .setNumber(33)
-                .setSmallIcon(R.drawable.logo_transparent)
+                .setSmallIcon(R.drawable.ic_status_bar)
                 // This provocate the badge issue: no badge for group notification
                 .setGroup("GroupKey")
                 .setGroupSummary(true)
@@ -147,7 +147,7 @@ class DebugMenuActivity : VectorBaseActivity() {
                         // For shortcut on long press on launcher icon
                         .setBadgeIconType(NotificationCompat.BADGE_ICON_NONE)
                         .setStyle(messagingStyle1)
-                        .setSmallIcon(R.drawable.logo_transparent)
+                        .setSmallIcon(R.drawable.ic_status_bar)
                         .setGroup("GroupKey")
                         .build()
         )
@@ -159,7 +159,7 @@ class DebugMenuActivity : VectorBaseActivity() {
                         .setContentTitle("Title 2")
                         .setContentText("Content 2")
                         .setStyle(messagingStyle2)
-                        .setSmallIcon(R.drawable.logo_transparent)
+                        .setSmallIcon(R.drawable.ic_status_bar)
                         .setGroup("GroupKey")
                         .build()
         )

vector/src/main/java/im/vector/riotx/core/utils/ExternalApplicationsUtil.kt

@@ -144,10 +144,10 @@ fun openCamera(activity: Activity, titlePrefix: String, requestCode: Int): Strin
             Timber.e("Cannot use the external storage media to save image")
         }
     } catch (uoe: UnsupportedOperationException) {
-        Timber.e(uoe, "Unable to insert camera URI into MediaStore.Images.Media.EXTERNAL_CONTENT_URI " +
-                "no SD card? Attempting to insert into device storage.")
+        Timber.e(uoe, "Unable to insert camera URI into MediaStore.Images.Media.EXTERNAL_CONTENT_URI.")
+        Timber.e("no SD card? Attempting to insert into device storage.")
     } catch (e: Exception) {
-        Timber.e(e, "Unable to insert camera URI into MediaStore.Images.Media.EXTERNAL_CONTENT_URI. $e")
+        Timber.e(e, "Unable to insert camera URI into MediaStore.Images.Media.EXTERNAL_CONTENT_URI.")
     }
 
     if (null == dummyUri) {
@@ -157,13 +157,13 @@ fun openCamera(activity: Activity, titlePrefix: String, requestCode: Int): Strin
                 Timber.e("Cannot use the internal storage to save media to save image")
             }
         } catch (e: Exception) {
-            Timber.e(e, "Unable to insert camera URI into internal storage. Giving up. $e")
+            Timber.e(e, "Unable to insert camera URI into internal storage. Giving up.")
         }
     }
 
     if (dummyUri != null) {
         captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, dummyUri)
-        Timber.v("trying to take a photo on " + dummyUri.toString())
+        Timber.v("trying to take a photo on $dummyUri")
     } else {
         Timber.v("trying to take a photo with no predefined uri")
     }

vector/src/main/java/im/vector/riotx/features/configuration/VectorConfiguration.kt

@@ -36,8 +36,8 @@ class VectorConfiguration @Inject constructor(private val context: Context) {
     // TODO Import mLanguageReceiver From Riot?
     fun onConfigurationChanged() {
         if (Locale.getDefault().toString() != VectorLocale.applicationLocale.toString()) {
-            Timber.v("## onConfigurationChanged() : the locale has been updated to " + Locale.getDefault().toString()
-                     + ", restore the expected value " + VectorLocale.applicationLocale.toString())
+            Timber.v("## onConfigurationChanged(): the locale has been updated to ${Locale.getDefault()}")
+            Timber.v("## onConfigurationChanged(): restore the expected value ${VectorLocale.applicationLocale}")
             updateApplicationSettings(VectorLocale.applicationLocale,
                                       FontScale.getFontScalePrefValue(context),
                                       ThemeUtils.getApplicationTheme(context))

vector/src/main/java/im/vector/riotx/features/crypto/keysbackup/restore/KeysBackupRestoreFromPassphraseViewModel.kt

@@ -74,7 +74,7 @@ class KeysBackupRestoreFromPassphraseViewModel @Inject constructor() : ViewModel
                                         isIndeterminate = true))
                             }
                             is StepProgressListener.Step.ImportingKey -> {
-                                Timber.d("backupKeys.ImportingKey.progress: " + step.progress)
+                                Timber.d("backupKeys.ImportingKey.progress: ${step.progress}")
                                 // Progress 0 can take a while, display an indeterminate progress in this case
                                 if (step.progress == 0) {
                                     sharedViewModel.loadingEvent.postValue(WaitingViewData(context.getString(R.string.keys_backup_restoring_waiting_message)

vector/src/main/java/im/vector/riotx/features/login/LoginCaptchaFragment.kt

@@ -89,7 +89,7 @@ class LoginCaptchaFragment @Inject constructor(
             }
 
             override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) {
-                Timber.d("## onReceivedSslError() : " + error.certificate)
+                Timber.d("## onReceivedSslError() : ${error.certificate}")
 
                 if (!isAdded) {
                     return

vector/src/main/java/im/vector/riotx/features/rageshake/VectorUncaughtExceptionHandler.kt

@@ -99,9 +99,9 @@ class VectorUncaughtExceptionHandler @Inject constructor(private val bugReporter
         val pw = PrintWriter(sw, true)
         throwable.printStackTrace(pw)
         b.append(sw.buffer.toString())
-        Timber.e("FATAL EXCEPTION " + b.toString())
 
         val bugDescription = b.toString()
+        Timber.e("FATAL EXCEPTION $bugDescription")
 
         bugReporter.saveCrashReport(context, bugDescription)
 

vector/src/main/java/im/vector/riotx/features/settings/VectorPreferences.kt

@@ -423,7 +423,7 @@ class VectorPreferences @Inject constructor(private val context: Context) {
             uri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
         }
 
-        Timber.v("## getNotificationRingTone() returns " + uri!!)
+        Timber.v("## getNotificationRingTone() returns $uri")
         return uri
     }