Remove unused module matrix-sdk-android-rx and do some cleanup

attachment-viewer/build.gradle

@@ -47,12 +47,10 @@ android {
 
 dependencies {
     implementation project(":library:ui-styles")
+    implementation project(":library:core-utils")
 
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
 
-    implementation libs.rx.rxKotlin
-    implementation libs.rx.rxAndroid
-
     implementation libs.androidx.core
     implementation libs.androidx.appCompat
     implementation libs.androidx.recyclerview

attachment-viewer/src/main/java/im/vector/lib/attachmentviewer/VideoViewHolder.kt

@@ -20,12 +20,9 @@ import android.util.Log
 import android.view.View
 import androidx.core.view.isVisible
 import im.vector.lib.attachmentviewer.databinding.ItemVideoAttachmentBinding
-import io.reactivex.Observable
-import io.reactivex.android.schedulers.AndroidSchedulers
-import io.reactivex.disposables.Disposable
+import im.vector.lib.core.utils.timer.CountUpTimer
 import java.io.File
 import java.lang.ref.WeakReference
-import java.util.concurrent.TimeUnit
 
 // TODO, it would be probably better to use a unique media player
 // for better customization and control
@@ -35,7 +32,7 @@ class VideoViewHolder constructor(itemView: View) :
 
     private var isSelected = false
     private var mVideoPath: String? = null
-    private var progressDisposable: Disposable? = null
+    private var countUpTimer: CountUpTimer? = null
     private var progress: Int = 0
     private var wasPaused = false
 
@@ -47,8 +44,7 @@ class VideoViewHolder constructor(itemView: View) :
 
     override fun onRecycled() {
         super.onRecycled()
-        progressDisposable?.dispose()
-        progressDisposable = null
+        stopTimer()
         mVideoPath = null
     }
 
@@ -72,8 +68,7 @@ class VideoViewHolder constructor(itemView: View) :
     override fun entersBackground() {
         if (views.videoView.isPlaying) {
             progress = views.videoView.currentPosition
-            progressDisposable?.dispose()
-            progressDisposable = null
+            stopTimer()
             views.videoView.stopPlayback()
             views.videoView.pause()
         }
@@ -91,8 +86,7 @@ class VideoViewHolder constructor(itemView: View) :
             } else {
                 progress = 0
             }
-            progressDisposable?.dispose()
-            progressDisposable = null
+            stopTimer()
         } else {
             if (mVideoPath != null) {
                 startPlaying()
@@ -107,17 +101,19 @@ class VideoViewHolder constructor(itemView: View) :
         views.videoView.isVisible = true
 
         views.videoView.setOnPreparedListener {
-            progressDisposable?.dispose()
-            progressDisposable = Observable.interval(100, TimeUnit.MILLISECONDS)
-                    .timeInterval()
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe {
+            stopTimer()
+            countUpTimer = CountUpTimer(100).also {
+                it.tickListener = object : CountUpTimer.TickListener {
+                    override fun onTick(milliseconds: Long) {
                         val duration = views.videoView.duration
                         val progress = views.videoView.currentPosition
                         val isPlaying = views.videoView.isPlaying
 //                        Log.v("FOO", "isPlaying $isPlaying $progress/$duration")
                         eventListener?.get()?.onEvent(AttachmentEvents.VideoEvent(isPlaying, progress, duration))
                     }
+                }
+                it.resume()
+            }
         }
         try {
             views.videoView.setVideoPath(mVideoPath)
@@ -134,6 +130,11 @@ class VideoViewHolder constructor(itemView: View) :
         }
     }
 
+    private fun stopTimer() {
+        countUpTimer?.stop()
+        countUpTimer = null
+    }
+
     override fun handleCommand(commands: AttachmentCommands) {
         if (!isSelected) return
         when (commands) {

build.gradle

@@ -153,13 +153,3 @@ project(":diff-match-patch") {
 //        }
 //    }
 //}
-//
-//project(":matrix-sdk-android-rx") {
-//    sonarqube {
-//        properties {
-//            property "sonar.sources", project(":matrix-sdk-android-rx").android.sourceSets.main.java.srcDirs
-//            // exclude source code from analyses separated by a colon (:)
-//            // property "sonar.exclusions", "**/*.*"
-//        }
-//    }
-//}

changelog.d/4942.misc

@@ -0,0 +1 @@
+Remove unused module matrix-sdk-android-rx and do some cleanup

dependencies.gradle

@@ -42,7 +42,6 @@ ext.libs = [
         jetbrains   : [
                 'coroutinesCore'          : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutines",
                 'coroutinesAndroid'       : "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinCoroutines",
-                'coroutinesRx2'           : "org.jetbrains.kotlinx:kotlinx-coroutines-rx2:$kotlinCoroutines",
                 'coroutinesTest'          : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlinCoroutines"
         ],
         androidx    : [
@@ -87,8 +86,7 @@ ext.libs = [
                 'retrofitMoshi'          : "com.squareup.retrofit2:converter-moshi:$retrofit"
         ],
         rx          : [
-                'rxKotlin'               : "io.reactivex.rxjava2:rxkotlin:2.4.0",
-                'rxAndroid'              : "io.reactivex.rxjava2:rxandroid:2.1.1"
+                'rxKotlin'               : "io.reactivex.rxjava2:rxkotlin:2.4.0"
         ],
         arrow       : [
                 'core'                   : "io.arrow-kt:arrow-core:$arrow",

library/core-utils/.gitignore

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

library/core-utils/build.gradle

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2021 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.
+ */
+
+plugins {
+    id 'com.android.library'
+    id 'kotlin-android'
+}
+
+android {
+    compileSdk versions.compileSdk
+    defaultConfig {
+        minSdk versions.minSdk
+        targetSdk versions.targetSdk
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility versions.sourceCompat
+        targetCompatibility versions.targetCompat
+    }
+
+    kotlinOptions {
+        jvmTarget = "11"
+        freeCompilerArgs += [
+                "-Xopt-in=kotlin.RequiresOptIn"
+        ]
+    }
+}
+
+dependencies {
+    implementation libs.androidx.appCompat
+    implementation libs.jetbrains.coroutinesAndroid
+}

library/core-utils/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="im.vector.lib.core.utils" />

vector/src/main/java/im/vector/app/core/flow/TimingOperators.kt → library/core-utils/src/main/java/im/vector/lib/core/utils/flow/TimingOperators.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package im.vector.app.core.flow
+package im.vector.lib.core.utils.flow
 
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -85,10 +85,12 @@ fun <T> Flow<T>.throttleFirst(windowDuration: Long): Flow<T> = flow {
     }
 }
 
+@ExperimentalCoroutinesApi
 fun tickerFlow(scope: CoroutineScope, delayMillis: Long, initialDelayMillis: Long = delayMillis): Flow<Unit> {
     return scope.fixedPeriodTicker(delayMillis, initialDelayMillis).consumeAsFlow()
 }
 
+@ExperimentalCoroutinesApi
 private fun CoroutineScope.fixedPeriodTicker(delayMillis: Long, initialDelayMillis: Long = delayMillis): ReceiveChannel<Unit> {
     require(delayMillis >= 0) { "Expected non-negative delay, but has $delayMillis ms" }
     require(initialDelayMillis >= 0) { "Expected non-negative initial delay, but has $initialDelayMillis ms" }

vector/src/main/java/im/vector/app/core/utils/CountUpTimer.kt → library/core-utils/src/main/java/im/vector/lib/core/utils/timer/CountUpTimer.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package im.vector.app.core.utils
+package im.vector.lib.core.utils.timer
 
-import im.vector.app.core.flow.tickerFlow
+import im.vector.lib.core.utils.flow.tickerFlow
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
@@ -27,6 +27,7 @@ import kotlinx.coroutines.flow.onEach
 import java.util.concurrent.atomic.AtomicBoolean
 import java.util.concurrent.atomic.AtomicLong
 
+@OptIn(kotlinx.coroutines.ExperimentalCoroutinesApi::class)
 class CountUpTimer(private val intervalInMs: Long = 1_000) {
 
     private val coroutineScope = CoroutineScope(Dispatchers.Main)