Merge branch 'develop' into new/licence-contactus

app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt

 package chat.rocket.android.helper
 
 import timber.log.Timber
-import android.util.Log
 
+// Production logger... Just ignore it
 class CrashlyticsTree : Timber.Tree() {
 
     override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
-        Log.println(priority, tag, message)
-
-        if (throwable != null) {
-            Log.e(tag,throwable.toString())
-        }
+        throwable?.printStackTrace()
     }
 }

app/src/main/res/drawable/ic_camera.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="18dp"
+    android:viewportWidth="20"
+    android:viewportHeight="18">
+
+    <path
+        android:fillColor="#1D74F5"
+        android:fillType="nonZero"
+        android:pathData="M10,10m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#1D74F5"
+        android:fillType="nonZero"
+        android:pathData="M7,0L5.17,2L2,2C0.9,2 0,2.9 0,4L0,16C0,17.1 0.9,18 2,18L18,18C19.1,18 20,17.1 20,16L20,4C20,2.9 19.1,2 18,2L14.83,2L13,0L7,0ZM10,15C7.24,15 5,12.76 5,10C5,7.24 7.24,5 10,5C12.76,5 15,7.24 15,10C15,12.76 12.76,15 10,15Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file

app/src/main/res/layout/message_attachment_options.xml

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="20dp"
-        android:drawableStart="@drawable/ic_photo_camera_black_24dp"
+        android:drawableStart="@drawable/ic_camera"
         android:gravity="start|center"
         android:text="@string/action_take_a_photo" />
 

app/src/play/java/chat/rocket/android/helper/CrashlyticsTree.kt

@@ -6,7 +6,7 @@ import timber.log.Timber
 class CrashlyticsTree : Timber.Tree() {
 
     override fun log(priority: Int, tag: String?, message: String, throwable: Throwable?) {
-        Crashlytics.log(priority, tag, message)
+        Crashlytics.log(message)
 
         if (throwable != null) {
             Crashlytics.logException(throwable)