Merge branch 'develop' into feature/fga/navigation First step: makes it compile by disabling the new screens (need to migrate to nodes)

app/src/main/java/io/element/android/x/ElementRootModule.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x
 
 import com.airbnb.android.showkase.annotation.ShowkaseRoot

app/src/main/java/io/element/android/x/ElementXApplication.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x
 
 import android.app.Application
@@ -9,8 +25,10 @@ import io.element.android.x.di.AppComponent
 import io.element.android.x.di.DaggerAppComponent
 import io.element.android.x.di.SessionComponentsOwner
 import io.element.android.x.initializer.CoilInitializer
+import io.element.android.x.initializer.CrashInitializer
 import io.element.android.x.initializer.MatrixInitializer
 import io.element.android.x.initializer.MavericksInitializer
+import io.element.android.x.initializer.TimberInitializer
 
 class ElementXApplication : Application(), DaggerComponentOwner {
 
@@ -25,6 +43,8 @@ class ElementXApplication : Application(), DaggerComponentOwner {
         appComponent = DaggerAppComponent.factory().create(applicationContext)
         sessionComponentsOwner = bindings<AppBindings>().sessionComponentsOwner()
         AppInitializer.getInstance(this).apply {
+            initializeComponent(CrashInitializer::class.java)
+            initializeComponent(TimberInitializer::class.java)
             initializeComponent(MatrixInitializer::class.java)
             initializeComponent(CoilInitializer::class.java)
             initializeComponent(MavericksInitializer::class.java)

app/src/main/java/io/element/android/x/MainActivity.kt

@@ -1,13 +1,23 @@
-@file:OptIn(
-    ExperimentalAnimationApi::class,
-    ExperimentalMaterialNavigationApi::class
-)
+/*
+ * 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 io.element.android.x
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
-import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -15,7 +25,6 @@ import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
 import com.bumble.appyx.core.integration.NodeHost
 import com.bumble.appyx.core.integrationpoint.NodeComponentActivity
-import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import io.element.android.x.architecture.bindings
 import io.element.android.x.core.di.DaggerComponentOwner
 import io.element.android.x.designsystem.ElementXTheme

app/src/main/java/io/element/android/x/MainViewModel.kt

@@ -1,53 +0,0 @@
-package io.element.android.x
-
-import com.airbnb.mvrx.MavericksState
-import com.airbnb.mvrx.MavericksViewModel
-import com.airbnb.mvrx.MavericksViewModelFactory
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
-import io.element.android.x.anvilannotations.ContributesViewModel
-import io.element.android.x.architecture.viewmodel.daggerMavericksViewModelFactory
-import io.element.android.x.di.AppScope
-import io.element.android.x.di.SessionComponentsOwner
-import io.element.android.x.matrix.Matrix
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-
-data class MainState(val fake: Boolean = false) : MavericksState
-
-@ContributesViewModel(AppScope::class)
-class MainViewModel @AssistedInject constructor(
-    private val matrix: Matrix,
-    private val sessionComponentsOwner: SessionComponentsOwner,
-    @Assisted initialState: MainState
-) : MavericksViewModel<MainState>(initialState) {
-
-    companion object :
-        MavericksViewModelFactory<MainViewModel, MainState> by daggerMavericksViewModelFactory()
-
-    suspend fun isLoggedIn(): Boolean {
-        return matrix.isLoggedIn().first()
-    }
-
-    fun startSyncIfLogged() {
-        viewModelScope.launch {
-            if (!isLoggedIn()) return@launch
-        }
-    }
-
-    fun stopSyncIfLogged() {
-        viewModelScope.launch {
-            if (!isLoggedIn()) return@launch
-        }
-    }
-
-    suspend fun restoreSession() {
-        val matrixClient = matrix.restoreSession()
-        if (matrixClient == null) {
-            throw IllegalStateException("Couldn't restore session...")
-        } else {
-            sessionComponentsOwner.create(matrixClient)
-            matrixClient.startSync()
-        }
-    }
-}

app/src/main/java/io/element/android/x/di/AppBindings.kt

@@ -1,14 +1,30 @@
+/*
+ * 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 io.element.android.x.di
 
 import com.squareup.anvil.annotations.ContributesTo
 import io.element.android.x.matrix.Matrix
-import io.element.android.x.node.LoggedInFlowNode
-import io.element.android.x.node.RootFlowNode
+import io.element.android.x.matrix.ui.MatrixUi
 import kotlinx.coroutines.CoroutineScope
 
 @ContributesTo(AppScope::class)
 interface AppBindings {
     fun coroutineScope(): CoroutineScope
     fun matrix(): Matrix
+    fun matrixUi(): MatrixUi
     fun sessionComponentsOwner(): SessionComponentsOwner
 }

app/src/main/java/io/element/android/x/di/AppComponent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x.di
 
 import android.content.Context

app/src/main/java/io/element/android/x/di/AppModule.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x.di
 
 import com.squareup.anvil.annotations.ContributesTo
@@ -17,4 +33,4 @@ object AppModule {
     fun providesAppCoroutineScope(): CoroutineScope {
         return MainScope() + CoroutineName("ElementX Scope")
     }
-}
+}

app/src/main/java/io/element/android/x/di/SessionComponent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x.di
 
 import com.squareup.anvil.annotations.ContributesTo

app/src/main/java/io/element/android/x/di/SessionComponentsOwner.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x.di
 
 import android.content.Context
@@ -42,5 +58,4 @@ class SessionComponentsOwner @Inject constructor(@ApplicationContext private val
             activeSessionComponent = null
         }
     }
-
 }

app/src/main/java/io/element/android/x/initializer/CoilInitializer.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x.initializer
 
 import android.content.Context
@@ -19,22 +35,19 @@ class CoilInitializer : Initializer<Unit> {
 
 private class ElementImageLoaderFactory(
     private val context: Context
-) :
-    ImageLoaderFactory {
+) : ImageLoaderFactory {
     override fun newImageLoader(): ImageLoader {
         return ImageLoader
             .Builder(context)
             .components {
                 val appBindings = context.bindings<AppBindings>()
-                val matrix = appBindings.matrix()
+                val matrixUi = appBindings.matrixUi()
                 val matrixClientProvider = {
                     appBindings
                         .sessionComponentsOwner().activeSessionComponent?.matrixClient()
                 }
-                matrix.registerCoilComponents(this, matrixClientProvider)
+                matrixUi.registerCoilComponents(this, matrixClientProvider)
             }
             .build()
     }
-
-
 }

app/src/main/java/io/element/android/x/initializer/CrashInitializer.kt

@@ -0,0 +1,30 @@
+/*
+ * 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 io.element.android.x.initializer
+
+import android.content.Context
+import androidx.startup.Initializer
+import io.element.android.x.features.rageshake.crash.VectorUncaughtExceptionHandler
+
+class CrashInitializer : Initializer<Unit> {
+
+    override fun create(context: Context) {
+        VectorUncaughtExceptionHandler(context).activate()
+    }
+
+    override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()
+}

app/src/main/java/io/element/android/x/initializer/MatrixInitializer.kt

@@ -1,11 +1,26 @@
+/*
+ * 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 io.element.android.x.initializer
 
 import android.content.Context
 import androidx.startup.Initializer
-import com.airbnb.mvrx.Mavericks
+import io.element.android.x.BuildConfig
 import io.element.android.x.matrix.tracing.TracingConfigurations
 import io.element.android.x.matrix.tracing.setupTracing
-import io.element.android.x.sdk.matrix.BuildConfig
 
 class MatrixInitializer : Initializer<Unit> {
 
@@ -19,5 +34,4 @@ class MatrixInitializer : Initializer<Unit> {
 
     override fun dependencies(): List<Class<out Initializer<*>>> = listOf(TimberInitializer::class.java)
 
-
 }

app/src/main/java/io/element/android/x/initializer/MavericksInitializer.kt

@@ -1,3 +1,19 @@
+/*
+ * 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 io.element.android.x.initializer
 
 import android.content.Context
@@ -11,6 +27,4 @@ class MavericksInitializer : Initializer<Unit> {
     }
 
     override fun dependencies(): List<Class<out Initializer<*>>> = listOf()
-
-
-}
+}

app/src/main/java/io/element/android/x/initializer/TimberInitializer.kt

@@ -1,13 +1,34 @@
+/*
+ * 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 io.element.android.x.initializer
 
 import android.content.Context
 import androidx.startup.Initializer
+import io.element.android.x.BuildConfig
+import io.element.android.x.features.rageshake.logs.VectorFileLogger
 import timber.log.Timber
 
 class TimberInitializer : Initializer<Unit> {
 
     override fun create(context: Context) {
-        Timber.plant(Timber.DebugTree())
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        }
+        Timber.plant(VectorFileLogger(context))
     }
 
     override fun dependencies(): List<Class<out Initializer<*>>> = emptyList()

app/src/main/java/io/element/android/x/node/RootFlowNode.kt

@@ -8,6 +8,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -31,6 +32,9 @@ import io.element.android.x.BuildConfig
 import io.element.android.x.component.ShowkaseButton
 import io.element.android.x.core.di.DaggerComponentOwner
 import io.element.android.x.di.SessionComponentsOwner
+import io.element.android.x.features.rageshake.bugreport.BugReportScreen
+import io.element.android.x.features.rageshake.crash.ui.CrashDetectionScreen
+import io.element.android.x.features.rageshake.detection.RageshakeDetectionScreen
 import io.element.android.x.getBrowserIntent
 import io.element.android.x.matrix.Matrix
 import io.element.android.x.matrix.core.SessionId
@@ -118,6 +122,28 @@ class RootFlowNode(
                 onCloseClicked = { isShowkaseButtonVisible = false },
                 onClick = { startActivity(context, Showkase.getBrowserIntent(context), null) }
             )
+
+            /*
+            var isBugReportVisible by rememberSaveable {
+                mutableStateOf(false)
+            }
+            RageshakeDetectionScreen(
+                onOpenBugReport = {
+                    isBugReportVisible = true
+                }
+            )
+            CrashDetectionScreen(
+                onOpenBugReport = {
+                    isBugReportVisible = true
+                }
+            )
+            if (isBugReportVisible) {
+                // TODO Improve the navigation, when pressing back here, it closes the app.
+                BugReportScreen(
+                    onDone = { isBugReportVisible = false }
+                )
+            }
+             */
         }
     }