[Deps] Update automattic-tracks to 6.0.4 (#1731)

Author: ParaskP7

Simplenote/build.gradle

@@ -73,7 +73,7 @@ android {
 
 buildscript {
     dependencies {
-        classpath 'io.sentry:sentry-android-gradle-plugin:3.5.0'
+        classpath "io.sentry:sentry-android-gradle-plugin:$sentryVersion"
     }
 
     repositories {
@@ -109,13 +109,11 @@ dependencies {
     testImplementation 'org.json:json:20210307'
 
     // Fastlane screengrab for screenshots automation
-    androidTestImplementation 'tools.fastlane:screengrab:2.0.0'
+    androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion"
     // Automattic and WordPress dependencies
     implementation 'com.automattic:simperium:v1.3.1'
-    implementation('com.github.Automattic:Automattic-Tracks-Android:2.1.0') {
-        // Tracks lib is referring to an unavailable build of okhttp
-        exclude group: 'com.squareup.okhttp3'
-    }
+    implementation "com.automattic:Automattic-Tracks-Android:$automatticTracksVersion"
+    implementation "com.automattic.tracks:crashlogging:$automatticTracksVersion"
 
     // Kotlin's coroutines
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
@@ -133,10 +131,10 @@ dependencies {
     // Support for ViewModels and LiveData
     implementation "androidx.activity:activity-ktx:1.3.1"
     implementation "androidx.fragment:fragment-ktx:1.3.6"
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.1'
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$androidxLifecycleVersion"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$androidxLifecycleVersion"
     // Support for androidx Fragments
-    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.1"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:$androidxLifecycleVersion"
 
     // Google Play Services
     implementation 'com.google.android.gms:play-services-wearable:17.0.0'
@@ -146,9 +144,9 @@ dependencies {
     implementation 'net.openid:appauth:0.7.0'
 
     // Dagger Hilt dependencies
-    implementation 'com.google.dagger:hilt-android:2.38.1'
-    annotationProcessor 'com.google.dagger:hilt-compiler:2.38.1'
-    kapt 'com.google.dagger:hilt-compiler:2.38.1'
+    implementation "com.google.dagger:hilt-android:$google_dagger"
+    annotationProcessor "com.google.dagger:hilt-compiler:$google_dagger"
+    kapt "com.google.dagger:hilt-compiler:$google_dagger"
 
     wearApp project(':Wear')
     implementation project(':PasscodeLock')
@@ -159,6 +157,7 @@ repositories {
         url "https://a8c-libs.s3.amazonaws.com/android"
         content {
             includeGroup "com.automattic"
+            includeGroup "com.automattic.tracks"
         }
     }
     maven { url "https://maven.google.com" }

Simplenote/src/main/java/com/automattic/simplenote/AddTagActivity.kt

@@ -98,6 +98,7 @@ class AddTagActivity : AppCompatActivity() {
                     DisplayUtils.hideKeyboard(tagInput)
                     showDialogError()
                 }
+                else -> {} // Do nothing
             }
         })
     }

Simplenote/src/main/java/com/automattic/simplenote/Simplenote.java

@@ -99,6 +99,7 @@ public class Simplenote extends Application implements HeartbeatListener {
 
     public void onCreate() {
         super.onCreate();
+        crashLogging.initialize();
 
         SimplenoteAppLock appLock = new SimplenoteAppLock(this);
         AppLockManager.getInstance().setCurrentAppLock(appLock);

Simplenote/src/main/java/com/automattic/simplenote/authentication/magiclink/MagicLinkConfirmationFragment.kt

@@ -70,6 +70,7 @@ class MagicLinkConfirmationFragment : Fragment() {
                         parentFragmentManager.popBackStack()
                     }
                 }
+                else -> {} // Do nothing
             }
         }
         return view

Simplenote/src/main/java/com/automattic/simplenote/authentication/magiclink/OkHttpMagicLinkRepository.kt

@@ -20,7 +20,7 @@ class OkHttpMagicLinkRepository @Inject constructor(private val simpleHttp: Simp
             "account/complete-login",
             mapOf(Pair("username", username), Pair("auth_code", authCode))
         ).use { response ->
-            val body = response.body()?.string()
+            val body = response.body?.string()
             if (response.isSuccessful) {
                 val json = JSONObject(body ?: "")
                 val syncToken = json.getString("sync_token")
@@ -33,7 +33,7 @@ class OkHttpMagicLinkRepository @Inject constructor(private val simpleHttp: Simp
                 MagicLinkAuthError.REQUEST_NOT_FOUND -> R.string.magic_link_complete_login_expired_code_error_message
                 MagicLinkAuthError.UNKNOWN_ERROR -> R.string.magic_link_general_error
             }
-            return MagicLinkResponseResult.MagicLinkError(response.code(), authError, errorStringRes)
+            return MagicLinkResponseResult.MagicLinkError(response.code, authError, errorStringRes)
         }
     }
 
@@ -63,9 +63,9 @@ class OkHttpMagicLinkRepository @Inject constructor(private val simpleHttp: Simp
             mapOf(Pair("username", username), Pair("request_source", "android"))
         ).use { response ->
             if (response.isSuccessful) {
-                return MagicLinkResponseResult.MagicLinkRequestSuccess(response.code())
+                return MagicLinkResponseResult.MagicLinkRequestSuccess(response.code)
             } else {
-                return MagicLinkResponseResult.MagicLinkError(response.code())
+                return MagicLinkResponseResult.MagicLinkError(response.code)
             }
         }
     }

Simplenote/src/main/java/com/automattic/simplenote/networking/SimpleHttp.kt

@@ -1,7 +1,7 @@
 package com.automattic.simplenote.networking
 
 import okhttp3.HttpUrl
-import okhttp3.MediaType
+import okhttp3.MediaType.Companion.toMediaTypeOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
@@ -13,7 +13,7 @@ import javax.inject.Inject
 private const val HTTP_SCHEME = "https"
 private const val BASE_URL = "app.simplenote.com"
 open class SimpleHttp @Inject constructor(val client: OkHttpClient) {
-    private val jsonMediaType = MediaType.parse("application/json; charset=utf-8")
+    private val jsonMediaType = "application/json; charset=utf-8".toMediaTypeOrNull()
 
     private fun buildUrl(path: String): HttpUrl = HttpUrl.Builder()
         .scheme(HTTP_SCHEME)

Simplenote/src/main/java/com/automattic/simplenote/repositories/SimperiumCollaboratorsRepository.kt

@@ -69,17 +69,17 @@ class SimperiumCollaboratorsRepository @Inject constructor(
     override suspend fun collaboratorsChanged(noteId: String): Flow<Boolean> = callbackFlow {
         val callbackOnSaveObject = Bucket.OnSaveObjectListener<Note> { _, note ->
             if (note.simperiumKey == noteId) {
-                offer(true)
+                trySend(true).isSuccess
             }
         }
         val callbackOnDeleteObject = Bucket.OnDeleteObjectListener<Note> { _, note ->
             if (note.simperiumKey == noteId) {
-                offer(true)
+                trySend(true).isSuccess
             }
         }
         val callbackOnNetworkChange = Bucket.OnNetworkChangeListener<Note> { _, _, updatedNoteId ->
             if (updatedNoteId != null && noteId == updatedNoteId) {
-                offer(true)
+                trySend(true).isSuccess
             }
         }
 

Simplenote/src/main/java/com/automattic/simplenote/repositories/SimperiumTagsRepository.kt

@@ -12,7 +12,6 @@ import com.simperium.client.Bucket
 import com.simperium.client.BucketObjectNameInvalid
 import com.simperium.client.Query
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
@@ -82,9 +81,9 @@ class SimperiumTagsRepository @Inject constructor(
     }
 
     override suspend fun tagsChanged(): Flow<Boolean> = callbackFlow {
-        val callbackOnSaveObject = Bucket.OnSaveObjectListener<Tag> { _, _ -> offer(true) }
-        val callbackOnDeleteObject = Bucket.OnDeleteObjectListener<Tag> { _, _ -> offer(true) }
-        val callbackOnNetworkChange = Bucket.OnNetworkChangeListener<Tag> { _, _, _ -> offer(true) }
+        val callbackOnSaveObject = Bucket.OnSaveObjectListener<Tag> { _, _ -> trySend(true).isSuccess }
+        val callbackOnDeleteObject = Bucket.OnDeleteObjectListener<Tag> { _, _ -> trySend(true).isSuccess }
+        val callbackOnNetworkChange = Bucket.OnNetworkChangeListener<Tag> { _, _, _ -> trySend(true).isSuccess }
 
         tagsBucket.addOnSaveObjectListener(callbackOnSaveObject)
         tagsBucket.addOnDeleteObjectListener(callbackOnDeleteObject)

Simplenote/src/main/java/com/automattic/simplenote/utils/crashlogging/CrashLoggingModule.kt

@@ -1,6 +1,6 @@
 package com.automattic.simplenote.utils.crashlogging
 
-import android.content.Context
+import android.app.Application
 import com.automattic.android.tracks.crashlogging.CrashLogging
 import com.automattic.android.tracks.crashlogging.CrashLoggingDataProvider
 import com.automattic.android.tracks.crashlogging.CrashLoggingProvider
@@ -10,8 +10,9 @@ import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import javax.inject.Singleton
 
 @Module
@@ -20,8 +21,15 @@ abstract class CrashLoggingModule {
     companion object {
         @Provides
         @Singleton
-        fun provideCrashLogging(@ApplicationContext context: Context, crashLoggingDataProvider: CrashLoggingDataProvider): CrashLogging {
-            return CrashLoggingProvider.createInstance(context, crashLoggingDataProvider)
+        fun provideCrashLogging(
+            application: Application,
+            crashLoggingDataProvider: CrashLoggingDataProvider
+        ): CrashLogging {
+            return CrashLoggingProvider.createInstance(
+                application,
+                crashLoggingDataProvider,
+                CoroutineScope(Dispatchers.Default)
+            )
         }
     }
 

Simplenote/src/main/java/com/automattic/simplenote/utils/crashlogging/SimplenoteCrashLoggingDataProvider.kt

@@ -1,12 +1,20 @@
 package com.automattic.simplenote.utils.crashlogging
 
+import android.util.Log
 import com.automattic.android.tracks.crashlogging.CrashLoggingDataProvider
 import com.automattic.android.tracks.crashlogging.CrashLoggingUser
 import com.automattic.android.tracks.crashlogging.EventLevel
 import com.automattic.android.tracks.crashlogging.ExtraKnownKey
+import com.automattic.android.tracks.crashlogging.PerformanceMonitoringConfig
+import com.automattic.android.tracks.crashlogging.ReleaseName
 import com.automattic.simplenote.BuildConfig
 import com.automattic.simplenote.Simplenote
 import com.automattic.simplenote.utils.locale.LocaleProvider
+import com.simperium.client.User
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.emptyFlow
+import kotlinx.coroutines.flow.flow
 import java.util.Locale
 import javax.inject.Inject
 
@@ -16,21 +24,25 @@ class SimplenoteCrashLoggingDataProvider @Inject constructor(
 ) : CrashLoggingDataProvider {
 
     override val buildType = BuildConfig.BUILD_TYPE
-    override val enableCrashLoggingLogs = BuildConfig.DEBUG
+    override val enableCrashLoggingLogs = false
     override val sentryDSN: String = BuildConfig.SENTRY_DSN
 
     override val locale: Locale?
         get() = localeProvider.provideLocale()
 
-    override val releaseName = if (BuildConfig.DEBUG) {
-        DEBUG_RELEASE_NAME
+    override val releaseName: ReleaseName = if (BuildConfig.DEBUG) {
+        ReleaseName.SetByApplication(DEBUG_RELEASE_NAME)
     } else {
-        BuildConfig.VERSION_NAME
+        ReleaseName.SetByTracksLibrary
     }
 
-    override fun applicationContextProvider(): Map<String, String> {
-        return emptyMap()
-    }
+    override val user: Flow<CrashLoggingUser?>
+        get() = provideUser()
+
+    override val applicationContextProvider: Flow<Map<String, String>> = emptyFlow()
+
+    override val performanceMonitoringConfig: PerformanceMonitoringConfig
+        get() = PerformanceMonitoringConfig.Disabled
 
     override fun crashLoggingEnabled(): Boolean {
         return Simplenote.analyticsIsEnabled()
@@ -51,15 +63,26 @@ class SimplenoteCrashLoggingDataProvider @Inject constructor(
         return false
     }
 
-    override fun userProvider(): CrashLoggingUser {
+    private fun provideUser(): Flow<CrashLoggingUser?> =
+        flow {
+            emit(app.simperium?.user?.toCrashLoggingUser())
+        }.catch { e ->
+            Log.e(TAG, "Exception getting the user", e)
+            emit(null)
+        }
+
+    private fun User.toCrashLoggingUser(): CrashLoggingUser? {
+        if (userId.isNullOrEmpty()) return null
+
         return CrashLoggingUser(
-            userID = app.simperium.user.userId.orEmpty(),
-            email = app.simperium.user.email.orEmpty(),
+            userID = userId,
+            email = email.orEmpty(),
             username = ""
         )
     }
 
     companion object {
-        const val DEBUG_RELEASE_NAME = "debug"
+        private const val DEBUG_RELEASE_NAME = "debug"
+        private val TAG: String = SimplenoteCrashLoggingDataProvider::class.java.getSimpleName()
     }
 }