Merge pull request #14354 from woocommerce/tooling/integrate-automattic-enryptedlogging-1.0.0

[Encrypted Logging] Integrate `automattic-enryptedlogging` 1.0.0

Author: ParaskP7

WooCommerce-Wear/proguard-rules.pro

@@ -68,12 +68,6 @@
 -keep class uk.co.senab.photoview.** { *; }
 ###### Zendesk - end
 
-###### Encrypted Logs - begin
--dontwarn java.awt.*
--keep class com.sun.jna.* { *; }
--keepclassmembers class * extends com.sun.jna.* { public *; }
-###### Encrypted Logs - end
-
 ###### Glide - begin
 -keep class com.bumptech.glide.GeneratedAppGlideModuleImpl { *; }
 ###### Glide - end

WooCommerce/build.gradle

@@ -245,6 +245,7 @@ dependencies {
         exclude group: "com.android.support"
     }
 
+    implementation(libs.automattic.encryptedlogging)
     implementation(libs.automattic.tracks.experimentation)
     implementation(libs.automattic.tracks.android)
     implementation(libs.automattic.tracks.crashlogging)

WooCommerce/proguard-rules.pro

@@ -68,12 +68,6 @@
 -keep class uk.co.senab.photoview.** { *; }
 ###### Zendesk - end
 
-###### Encrypted Logs - begin
--dontwarn java.awt.*
--keep class com.sun.jna.* { *; }
--keepclassmembers class * extends com.sun.jna.* { public *; }
-###### Encrypted Logs - end
-
 ###### Glide - begin
 -keep class com.bumptech.glide.GeneratedAppGlideModuleImpl { *; }
 ###### Glide - end

WooCommerce/src/main/kotlin/com/woocommerce/android/AppInitializer.kt

@@ -58,7 +58,6 @@ import com.woocommerce.android.util.WooLog.T.DASHBOARD
 import com.woocommerce.android.util.WooLog.T.UTILS
 import com.woocommerce.android.util.WooLogWrapper
 import com.woocommerce.android.util.crashlogging.UploadEncryptedLogs
-import com.woocommerce.android.util.encryptedlogging.ObserveEncryptedLogsUploadResult
 import com.woocommerce.android.widgets.AppRatingDialog
 import dagger.Lazy
 import dagger.android.DispatchingAndroidInjector
@@ -122,8 +121,6 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
 
     @Inject lateinit var uploadEncryptedLogs: UploadEncryptedLogs
 
-    @Inject lateinit var observeEncryptedLogsUploadResults: ObserveEncryptedLogsUploadResult
-
     @Inject lateinit var sendTelemetry: SendTelemetry
 
     @Inject lateinit var siteObserver: SiteObserver
@@ -226,7 +223,6 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
 
         trackStartupAnalytics()
 
-        observeEncryptedLogsUploadResults()
         uploadEncryptedLogs()
 
         appCoroutineScope.launch {

WooCommerce/src/main/kotlin/com/woocommerce/android/analytics/AnalyticsEvent.kt

@@ -820,10 +820,6 @@ enum class AnalyticsEvent(override val siteless: Boolean = false) : IAnalyticsEv
     APP_PERMISSION_RATIONALE_ACCEPTED,
     APP_PERMISSION_RATIONALE_DISMISSED,
 
-    // -- Encrypted logging
-    ENCRYPTED_LOGGING_UPLOAD_SUCCESSFUL,
-    ENCRYPTED_LOGGING_UPLOAD_FAILED,
-
     // -- What's new / feature announcements
     FEATURE_ANNOUNCEMENT_SHOWN,
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/woopos/cardreader/WooPosCardReaderFacade.kt

@@ -39,6 +39,7 @@ class WooPosCardReaderFacade @Inject constructor(
         cardReaderManager.disconnectReader()
     }
 
+    @Suppress("DEPRECATION")
     private fun startActivity(intent: Intent) {
         val options = ActivityOptionsCompat.makeCustomAnimation(
             activity!!,

WooCommerce/src/main/kotlin/com/woocommerce/android/util/crashlogging/CrashLoggingModule.kt

@@ -1,13 +1,13 @@
 package com.woocommerce.android.util.crashlogging
 
 import android.app.Application
-import android.util.Base64
+import android.content.Context
 import com.automattic.android.tracks.crashlogging.CrashLogging
 import com.automattic.android.tracks.crashlogging.CrashLoggingDataProvider
 import com.automattic.android.tracks.crashlogging.CrashLoggingProvider
 import com.automattic.android.tracks.crashlogging.performance.PerformanceMonitoringRepositoryProvider
 import com.automattic.android.tracks.crashlogging.performance.PerformanceTransactionRepository
-import com.goterl.lazysodium.utils.Key
+import com.automattic.encryptedlogging.EncryptedLogging
 import com.woocommerce.android.BuildConfig
 import com.woocommerce.android.di.AppCoroutineScope
 import com.woocommerce.android.util.locale.ContextBasedLocaleProvider
@@ -16,10 +16,10 @@ 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 org.wordpress.android.fluxc.logging.FluxCCrashLogger
-import org.wordpress.android.fluxc.model.encryptedlogging.EncryptedLoggingKey
 import javax.inject.Singleton
 
 @InstallIn(SingletonComponent::class)
@@ -37,9 +37,15 @@ abstract class CrashLoggingModule {
         }
 
         @Provides
-        fun provideEncryptedLoggingKey(): EncryptedLoggingKey {
-            return EncryptedLoggingKey(Key.fromBytes(Base64.decode(BuildConfig.ENCRYPTED_LOGGING_KEY, Base64.DEFAULT)))
-        }
+        @Singleton
+        fun provideEncryptedLogging(
+            @ApplicationContext context: Context,
+        ): EncryptedLogging =
+            EncryptedLogging.getInstance(
+                context,
+                encryptedLoggingKey = BuildConfig.ENCRYPTED_LOGGING_KEY,
+                clientSecret = BuildConfig.OAUTH_APP_SECRET,
+            )
 
         @Provides
         fun provideFluxCCrashLogger(crashLogging: CrashLogging): FluxCCrashLogger {

WooCommerce/src/main/kotlin/com/woocommerce/android/util/crashlogging/EnqueueSendingEncryptedLogs.kt

@@ -2,26 +2,23 @@ package com.woocommerce.android.util.crashlogging
 
 import com.automattic.android.tracks.crashlogging.EventLevel
 import com.automattic.android.tracks.crashlogging.EventLevel.FATAL
+import com.automattic.encryptedlogging.EncryptedLogging
 import com.woocommerce.android.tools.NetworkStatus
-import org.wordpress.android.fluxc.Dispatcher
-import org.wordpress.android.fluxc.generated.EncryptedLogActionBuilder
-import org.wordpress.android.fluxc.store.EncryptedLogStore.UploadEncryptedLogPayload
 import javax.inject.Inject
 
 class EnqueueSendingEncryptedLogs @Inject constructor(
-    private val eventBusDispatcher: Dispatcher,
+    private val encryptedLogging: EncryptedLogging,
     private val wooLogFileProvider: WooLogFileProvider,
     private val networkStatus: NetworkStatus
 ) {
     operator fun invoke(
         uuid: String,
         eventLevel: EventLevel
     ) {
-        val payload = UploadEncryptedLogPayload(
+        encryptedLogging.enqueueSendingEncryptedLogs(
             uuid = uuid,
             file = wooLogFileProvider.provide(),
-            shouldStartUploadImmediately = eventLevel != FATAL && networkStatus.isConnected()
+            shouldUploadImmediately = eventLevel != FATAL && networkStatus.isConnected()
         )
-        eventBusDispatcher.dispatch(EncryptedLogActionBuilder.newUploadLogAction(payload))
     }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/util/crashlogging/UploadEncryptedLogs.kt

@@ -1,20 +1,13 @@
 package com.woocommerce.android.util.crashlogging
 
-import com.woocommerce.android.util.CoroutineDispatchers
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import org.wordpress.android.fluxc.store.EncryptedLogStore
+import com.automattic.encryptedlogging.EncryptedLogging
 import javax.inject.Inject
 
 class UploadEncryptedLogs @Inject constructor(
-    dispatchers: CoroutineDispatchers,
-    private val encryptedLogStore: EncryptedLogStore
+    private val encryptedLogging: EncryptedLogging
 ) {
-    private val coroutineScope = CoroutineScope(dispatchers.io)
-
     operator fun invoke() {
-        coroutineScope.launch {
-            encryptedLogStore.uploadQueuedEncryptedLogs()
-        }
+        encryptedLogging.resetUploadStates()
+        encryptedLogging.uploadEncryptedLogs()
     }
 }