Hotfix/1.3.15

CHANGES.md

@@ -1,3 +1,14 @@
+Changes in Element v1.3.15 (2022-01-18)
+=======================================
+
+Bugfixes 🐛
+----------
+ - Fix crash when viewing source which contains an emoji ([#4796](https://github.com/vector-im/element-android/issues/4796))
+ - Prevent crash in Timeline and add more logs. ([#4959](https://github.com/vector-im/element-android/issues/4959))
+ - Fix crash on API <24 and make sure this error will not occur again. ([#4962](https://github.com/vector-im/element-android/issues/4962))
+ - Fixes sign in/up crash when selecting ems and other server types which use SSO ([#4969](https://github.com/vector-im/element-android/issues/4969))
+
+
 Changes in Element v1.3.14 (2022-01-12)
 =======================================
 

dependencies.gradle

@@ -71,6 +71,7 @@ ext.libs = [
                 'espressoIntents'         : "androidx.test.espresso:espresso-intents:$espresso"
         ],
         google      : [
+                // TODO There is 1.6.0?
                 'material'                : "com.google.android.material:material:1.4.0"
         ],
         dagger      : [

dependencies_groups.gradle

@@ -4,7 +4,6 @@ ext.groups = [
                 ],
                 group: [
                         'com.github.Armen101',
-                        'com.github.BillCarsonFr',
                         'com.github.chrisbanes',
                         'com.github.hyuwah',
                         'com.github.jetradarmobile',
@@ -154,6 +153,7 @@ ext.groups = [
                         'org.jetbrains.intellij.deps',
                         'org.jetbrains.kotlin',
                         'org.jetbrains.kotlinx',
+                        'org.json',
                         'org.jsoup',
                         'org.junit',
                         'org.junit.jupiter',

fastlane/metadata/android/en-US/changelogs/40103150.txt

@@ -0,0 +1,2 @@
+Main changes in this version: First change in onboarding screens, including Analytics opt-in. Support for Events with Math added in the labs.
+Full changelog: https://github.com/vector-im/element-android/releases/tag/v1.3.15

library/jsonviewer/.gitignore

@@ -0,0 +1 @@
+/build

library/jsonviewer/build.gradle

@@ -0,0 +1,64 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-parcelize'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'com.jakewharton.butterknife'
+
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.jakewharton:butterknife-gradle-plugin:10.2.3'
+    }
+}
+
+android {
+    compileSdk versions.compileSdk
+
+    defaultConfig {
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    implementation libs.androidx.appCompat
+    implementation libs.androidx.core
+
+    implementation libs.airbnb.epoxy
+    kapt libs.airbnb.epoxyProcessor
+
+    implementation libs.airbnb.mavericks
+    // Span utils
+    implementation 'me.gujun.android:span:1.7'
+
+    implementation libs.google.material
+
+    implementation libs.jetbrains.coroutinesCore
+    implementation libs.jetbrains.coroutinesAndroid
+
+    testImplementation 'org.json:json:20190722'
+    testImplementation libs.tests.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espressoCore
+}

library/jsonviewer/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="org.billcarsonfr.jsonviewer" />

library/jsonviewer/src/main/java/org/billcarsonfr/jsonviewer/JSonViewerDialog.kt

@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2022 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.billcarsonfr.jsonviewer
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.WindowManager
+import androidx.fragment.app.DialogFragment
+import com.airbnb.mvrx.Mavericks
+
+class JSonViewerDialog : DialogFragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_dialog_jv, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val args: JSonViewerFragmentArgs = arguments?.getParcelable(Mavericks.KEY_ARG) ?: return
+        if (savedInstanceState == null) {
+            childFragmentManager.beginTransaction()
+                .replace(
+                    R.id.fragmentContainer, JSonViewerFragment.newInstance(
+                        args.jsonString,
+                        args.defaultOpenDepth,
+                        true,
+                        args.styleProvider
+                    )
+                )
+                .commitNow()
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        // Get existing layout params for the window
+        val params = dialog?.window?.attributes
+        // Assign window properties to fill the parent
+        params?.width = WindowManager.LayoutParams.MATCH_PARENT
+        params?.height = WindowManager.LayoutParams.MATCH_PARENT
+        dialog?.window?.attributes = params
+    }
+
+    companion object {
+        fun newInstance(
+            jsonString: String,
+            initialOpenDepth: Int = -1,
+            styleProvider: JSonViewerStyleProvider? = null
+        ): JSonViewerDialog {
+            val args = Bundle()
+            val parcelableArgs =
+                JSonViewerFragmentArgs(jsonString, initialOpenDepth, false, styleProvider)
+            args.putParcelable(Mavericks.KEY_ARG, parcelableArgs)
+            return JSonViewerDialog().apply { arguments = args }
+        }
+    }
+}