Merge branch 'woomob-1020-woo-possettings-add-ff-and-settings-button-to-the-menu' into woomob-1022-woo-possettings-prepare-infrastructure-for-the-settings

Author: kidinov

RELEASE-NOTES.txt

@@ -1,11 +1,14 @@
 *** PLEASE FOLLOW THIS FORMAT: [<priority indicator, more stars = higher priority>] <description> [<PR URL>]
 *** Use [*****] to indicate smoke tests of all critical flows should be run on the final APK before release (e.g. major library or targetSdk updates).
 *** For entries which are touching the Android Wear app's, start entry with `[WEAR]` too.
-
 23.1
 -----
+- [*] You can now remove background from product images in the app. Just open the product image and click "Remove background" button. [https://github.com/woocommerce/woocommerce-android/pull/14445]
 - [*] Fixed bug when an order was not selected when navigating from my store screen [https://github.com/woocommerce/woocommerce-android/pull/14436]
-
+- [*] [Shipping labels] Display split shipment instructions only when necessary [https://github.com/woocommerce/woocommerce-android/pull/14450]
+- [*] Updated behavior on the POS cash payment screen [https://github.com/woocommerce/woocommerce-android/pull/14449]
+- [Internal] Added support for persisting log files in the app's internal storage [https://github.com/woocommerce/woocommerce-android/pull/14425]
+- [*] Shipping labels: Fix layout issue with address status indicator [https://github.com/woocommerce/woocommerce-android/pull/14437]
 
 23.0
 -----

WooCommerce/build.gradle

@@ -330,6 +330,7 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'com.android.support', module: 'support-core-utils'
     }
+    testImplementation(libs.androidx.lifecycle.runtime.testing)
 
     // Dependencies for Espresso UI tests
     androidTestImplementation(libs.androidx.test.ext.junit)

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

@@ -56,7 +56,6 @@ import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.util.WooLog.T
 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.widgets.AppRatingDialog
 import dagger.Lazy
@@ -127,7 +126,7 @@ class AppInitializer @Inject constructor() : ApplicationLifecycleListener {
 
     @Inject lateinit var blazeCampaignsObserver: BlazeCampaignsObserver
 
-    @Inject lateinit var wooLog: WooLogWrapper
+    @Inject lateinit var wooLog: WooLog
 
     @Inject lateinit var registerDevice: RegisterDevice
 

WooCommerce/src/main/kotlin/com/woocommerce/android/di/AppConfigModule.kt

@@ -6,6 +6,7 @@ import com.woocommerce.android.AppPrefs
 import com.woocommerce.android.BuildConfig
 import com.woocommerce.android.FeedbackPrefs
 import com.woocommerce.android.util.StringUtils
+import com.woocommerce.android.util.WooLog
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -49,4 +50,11 @@ class AppConfigModule {
 
     @Provides
     fun provideWebViewCookieManager() = CookieManager.getInstance()
+
+    @Provides
+    @Singleton
+    fun provideWooLog(context: Context): WooLog {
+        WooLog.init(context)
+        return WooLog
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/local/LocalNotificationWorker.kt

@@ -19,8 +19,8 @@ import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Co
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_TITLE
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_TYPE
 import com.woocommerce.android.ui.main.MainActivity
+import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.util.WooLog.T
-import com.woocommerce.android.util.WooLogWrapper
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 
@@ -31,7 +31,7 @@ class LocalNotificationWorker @AssistedInject constructor(
     @Assisted workerParams: WorkerParameters,
     private val wooNotificationBuilder: WooNotificationBuilder,
     private val appsPrefsWrapper: AppPrefsWrapper,
-    private val wooLogWrapper: WooLogWrapper
+    private val wooLog: WooLog
 ) : CoroutineWorker(appContext, workerParams) {
 
     override suspend fun doWork(): Result {
@@ -59,7 +59,7 @@ class LocalNotificationWorker @AssistedInject constructor(
                 )
             )
         } else {
-            wooLogWrapper.e(T.NOTIFICATIONS, "Scheduled local notification data is invalid")
+            wooLog.e(T.NOTIFICATIONS, "Scheduled local notification data is invalid")
         }
         return Result.success()
     }

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/local/PreconditionCheckWorker.kt

@@ -12,8 +12,8 @@ import com.woocommerce.android.model.DashboardWidget
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_SITE_ID
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_TYPE
 import com.woocommerce.android.ui.dashboard.data.ObserveBlazeWidgetStatus
+import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.util.WooLog.T.NOTIFICATIONS
-import com.woocommerce.android.util.WooLogWrapper
 import com.woocommerce.android.util.WooPermissionUtils
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
@@ -24,7 +24,7 @@ import org.wordpress.android.fluxc.store.SiteStore
 class PreconditionCheckWorker @AssistedInject constructor(
     @Assisted private val appContext: Context,
     @Assisted workerParams: WorkerParameters,
-    private val wooLogWrapper: WooLogWrapper,
+    private val wooLog: WooLog,
     private val siteStore: SiteStore,
     private val observeBlazeWidgetStatus: ObserveBlazeWidgetStatus,
     private val crashLogging: CrashLogging,
@@ -67,7 +67,7 @@ class PreconditionCheckWorker @AssistedInject constructor(
         get() = VERSION.SDK_INT < VERSION_CODES.TIRAMISU || WooPermissionUtils.hasNotificationsPermission(appContext)
 
     private fun cancelWork(message: String): Result {
-        wooLogWrapper.i(NOTIFICATIONS, message)
+        wooLog.i(NOTIFICATIONS, message)
         WorkManager.getInstance(appContext).cancelWorkById(id)
         return Result.failure()
     }

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/push/NotificationMessageHandler.kt

@@ -16,8 +16,8 @@ import com.woocommerce.android.notifications.WooNotificationBuilder
 import com.woocommerce.android.notifications.WooNotificationType.NewOrder
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.util.NotificationsParser
+import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.util.WooLog.T.NOTIFS
-import com.woocommerce.android.util.WooLogWrapper
 import com.woocommerce.android.viewmodel.ResourceProvider
 import org.greenrobot.eventbus.EventBus
 import org.wordpress.android.fluxc.Dispatcher
@@ -35,7 +35,7 @@ class NotificationMessageHandler @Inject constructor(
     private val analyticsTracker: NotificationAnalyticsTracker,
     private val notificationsParser: NotificationsParser,
     private val accountStore: AccountStore,
-    private val wooLogWrapper: WooLogWrapper,
+    private val wooLog: WooLog,
     private val dispatcher: Dispatcher,
     private val resourceProvider: ResourceProvider,
     private val selectedSite: SelectedSite,
@@ -69,37 +69,37 @@ class NotificationMessageHandler @Inject constructor(
     @Suppress("ReturnCount", "ComplexMethod")
     fun onNewMessageReceived(messageData: Map<String, String>) {
         if (!accountStore.hasAccessToken()) {
-            wooLogWrapper.e(NOTIFS, "User is not logged in!")
+            wooLog.e(NOTIFS, "User is not logged in!")
             return
         }
 
         if (!selectedSite.exists()) {
-            wooLogWrapper.e(NOTIFS, "User has no site selected!")
+            wooLog.e(NOTIFS, "User has no site selected!")
             return
         }
 
         if (messageData.isEmpty()) {
-            wooLogWrapper.e(NOTIFS, "Push notification received without a valid Bundle!")
+            wooLog.e(NOTIFS, "Push notification received without a valid Bundle!")
             return
         }
 
         val pushUserId = messageData[PUSH_ARG_USER]
         // pushUserId is always set server side, but better to double check it here.
         if (accountStore.account.userId.toString() != pushUserId) {
-            wooLogWrapper.e(NOTIFS, "WP.com userId found in the app doesn't match with the ID in the PN. Aborting.")
+            wooLog.e(NOTIFS, "WP.com userId found in the app doesn't match with the ID in the PN. Aborting.")
             return
         }
 
         val notificationModel = notificationsParser.buildNotificationModelFromPayloadMap(messageData)
         if (notificationModel == null) {
-            wooLogWrapper.e(NOTIFS, "Notification data is empty!")
+            wooLog.e(NOTIFS, "Notification data is empty!")
             return
         }
 
         val notification = notificationModel.toAppModel(resourceProvider)
         if (notification.remoteNoteId == 0L) {
             // At this point 'note_id' is always available in the notification bundle.
-            wooLogWrapper.e(NOTIFS, "Push notification received without a valid note_id in the payload!")
+            wooLog.e(NOTIFS, "Push notification received without a valid note_id in the payload!")
             return
         }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/support/WooLogViewerActivity.kt

@@ -4,34 +4,40 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.activity.viewModels
 import com.woocommerce.android.R
 import com.woocommerce.android.extensions.copyToClipboard
 import com.woocommerce.android.ui.compose.theme.WooTheme
 import com.woocommerce.android.util.WooLog
 import com.woocommerce.android.util.WooLog.T
+import dagger.hilt.android.AndroidEntryPoint
 import org.wordpress.android.util.ToastUtils
 
+@AndroidEntryPoint
 class WooLogViewerActivity : ComponentActivity() {
+    private val viewModel: WooLogViewerViewModel by viewModels()
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         setContent {
             WooTheme {
-                WooLogViewerScreen(
-                    WooLog.logEntries,
-                    onBackPress = onBackPressedDispatcher::onBackPressed,
-                    onCopyButtonClick = ::copyAppLogToClipboard,
-                    onShareButtonClick = ::shareAppLog
-                )
+                WooLogViewerScreen(viewModel)
+            }
+        }
+
+        viewModel.event.observe(this) { event ->
+            when (event) {
+                is WooLogViewerViewModel.ShareLogs -> shareAppLog(event.logs)
+                is WooLogViewerViewModel.CopyLogs -> copyAppLogToClipboard(event.logs)
             }
         }
     }
 
-    private fun shareAppLog() {
-        WooLog.addDeviceInfoEntry(T.DEVICE, WooLog.LogLevel.w)
+    private fun shareAppLog(logs: String) {
         val intent = Intent(Intent.ACTION_SEND)
         intent.type = "text/plain"
-        intent.putExtra(Intent.EXTRA_TEXT, WooLog.toString())
+        intent.putExtra(Intent.EXTRA_TEXT, logs)
         intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.app_name) + " " + title)
         try {
             startActivity(Intent.createChooser(intent, getString(R.string.share)))
@@ -40,10 +46,9 @@ class WooLogViewerActivity : ComponentActivity() {
         }
     }
 
-    private fun copyAppLogToClipboard() {
+    private fun copyAppLogToClipboard(logs: String) {
         try {
-            WooLog.addDeviceInfoEntry(T.DEVICE, WooLog.LogLevel.w)
-            copyToClipboard("AppLog", WooLog.toString())
+            copyToClipboard("AppLog", logs)
             ToastUtils.showToast(this, R.string.logviewer_copied_to_clipboard)
         } catch (e: Exception) {
             WooLog.e(T.UTILS, e)