[In-app updates] Analytics tracking fix

.github/workflows/run-danger.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   dangermattic:
     if: ${{ (github.event.pull_request.draft == false) }}
-    uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1.1.0
+    uses: Automattic/dangermattic/.github/workflows/reusable-retry-buildkite-step-on-events.yml@v1.1.2
     with:
       org-slug: "automattic"
       pipeline-slug: "wordpress-android"

.github/workflows/validate-issues.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   check-labels-on-issues:
-    uses: Automattic/dangermattic/.github/workflows/reusable-check-labels-on-issues.yml@v1.0.0
+    uses: Automattic/dangermattic/.github/workflows/reusable-check-labels-on-issues.yml@v1.1.2
     with:
       label-format-list: '[
         "^\[.+\]",

README.md

@@ -16,41 +16,8 @@ If you're a developer wanting to contribute, read on.
 
 Notes:
 
-* To use WordPress.com features (login to WordPress.com, access Reader and Stats, etc) you need a WordPress.com OAuth2 ID and secret. Please read the [OAuth2 Authentication](#oauth2-authentication) section.
 * While loading/building the app in Android Studio ignore the prompt to update the gradle plugin version as that will probably introduce build errors. On the other hand, feel free to update if you are planning to work on ensuring the compatibility of the newer version.
 
-
-## OAuth2 Authentication ##
-
-In order to use WordPress.com functions you will need a client ID and
-a client secret key. These details will be used to authenticate your
-application and verify that the API calls being made are valid. You can
-create an application or view details for your existing applications with
-our [WordPress.com applications manager][5].
-
-When creating your application, you should select "Native client" for the application type.
-The "**Website URL**", "**Redirect URLs**", and "**Javascript Origins**" fields are required but not used for
-the mobile apps. Just use "**[https://localhost](https://localhost)**".
-
-Once you've created your application in the [applications manager][5], you'll
-need to edit the `./gradle.properties` file and change the
-`wp.oauth.app_id` and `wp.oauth.app_secret` fields. Then you can compile and
-run the app on a device or an emulator and try to login with a WordPress.com
-account. Note that authenticating to WordPress.com via Google is not supported
-in development builds of the app, only in the official release.
-
-Note that credentials created with our [WordPress.com applications manager][5]
-allow login only and not signup. New accounts must be created using the [official app][1]
-or [on the web](https://wordpress.com/start). Login is restricted to the WordPress.com
-account with which the credentials were created. In other words, if the credentials
-were created with foo@email.com, you will only be able to login with foo@email.com.
-Using another account like bar@email.com will cause the `Client cannot use "password" grant_type` error.
-
-For security reasons, some account-related actions aren't supported for development
-builds when using a WordPress.com account with 2-factor authentication enabled.
-
-Read more about [OAuth2][6] and the [WordPress.com REST endpoint][7].
-
 ## Build and Test ##
 
 To build, install, and test the project from the command line:
@@ -61,6 +28,13 @@ To build, install, and test the project from the command line:
     $ ./gradlew :WordPress:testWordPressVanillaDebugUnitTest         # assemble, install and run unit tests
     $ ./gradlew :WordPress:connectedWordPressVanillaDebugAndroidTest # assemble, install and run Android tests
 
+## Running the app ##
+
+You can use your own WordPress site for developing and testing the app. If you don't have one, you can create a temporary test site for free at https://jurassic.ninja/.
+On the app start up screen, choose "Enter your existing site address" and enter the URL of your site and your credentials.
+
+Note: Access to WordPress.com features is temporarily disabled in the development environment.
+
 ## Directory structure ##
     .
     ├── libs                    # dependencies used to build debug variants

RELEASE-NOTES.txt

@@ -2,7 +2,7 @@
 
 25.1
 -----
-
+* [*] [internal] Block editor: Add onContentUpdate bridge functionality [https://github.com/wordpress-mobile/gutenberg-mobile/pull/20852]
 
 25.0
 -----

WordPress/build.gradle

@@ -364,15 +364,15 @@ dependencies {
     implementation (project(path:':libs:editor')) {
         exclude group: 'org.wordpress', module: 'utils'
     }
-    implementation("$gradle.ext.fluxCBinaryPath") {
+    implementation("$gradle.ext.fluxCBinaryPath:$wordPressFluxCVersion") {
         version {
             strictly wordPressFluxCVersion
         }
         exclude group: "com.android.volley"
         exclude group: 'org.wordpress', module: 'utils'
         exclude group: 'com.android.support', module: 'support-annotations'
     }
-    implementation ("$gradle.ext.wputilsBinaryPath") {
+    implementation ("$gradle.ext.wputilsBinaryPath:$wordPressUtilsVersion") {
         version {
             strictly wordPressUtilsVersion
         }
@@ -383,7 +383,7 @@ dependencies {
     }
     implementation "$gradle.ext.aboutAutomatticBinaryPath:$automatticAboutVersion"
 
-    implementation("$gradle.ext.tracksBinaryPath") {
+    implementation("$gradle.ext.tracksBinaryPath:$automatticTracksVersion") {
         version {
             strictly automatticTracksVersion
         }

WordPress/src/debug/AndroidManifest.xml

@@ -26,6 +26,9 @@
         android:name="android.permission.DUMP"
         tools:ignore="ProtectedPermissions" />
 
+    <!-- Adds this permission temporarily here until Voice to content project is released -->
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
     <application
         android:name=".WordPressDebug"
         android:supportsRtl="true"

WordPress/src/main/AndroidManifest.xml

@@ -17,6 +17,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <!-- Required for storing and retrieving screenshots, taking photos, accessing media files -->
     <uses-permission
         android:name="android.permission.WRITE_EXTERNAL_STORAGE"

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

@@ -110,7 +110,7 @@ import org.wordpress.android.util.config.OpenWebLinksWithJetpackFlowFeatureConfi
 import org.wordpress.android.util.enqueuePeriodicUploadWorkRequestForAllSites
 import org.wordpress.android.util.experiments.ExPlat
 import org.wordpress.android.util.image.ImageManager
-import org.wordpress.android.widgets.AppRatingDialog
+import org.wordpress.android.widgets.AppReviewManager
 import org.wordpress.android.workers.WordPressWorkersFactory
 import java.io.File
 import java.io.IOException
@@ -303,7 +303,7 @@ class AppInitializer @Inject constructor(
         initWpDb()
         context?.let { enableHttpResponseCache(it) }
 
-        AppRatingDialog.init(application)
+        AppReviewManager.init(application)
 
         if (!initialized) {
             // EventBus setup

WordPress/src/main/java/org/wordpress/android/inappupdate/InAppUpdateAnalyticsTracker.kt

@@ -21,7 +21,7 @@ class InAppUpdateAnalyticsTracker @Inject constructor(
     }
 
     fun trackAppRestartToCompleteUpdate() {
-        tracker.track(AnalyticsTracker.Stat.IN_APP_UPDATE_COMPLETED_WITH_APP_RESTART)
+        tracker.track(AnalyticsTracker.Stat.IN_APP_UPDATE_COMPLETED_WITH_APP_RESTART_BY_USER)
     }
 
     private fun createPropertyMap(updateType: Int): Map<String, String> {

WordPress/src/main/java/org/wordpress/android/inappupdate/InAppUpdateManagerImpl.kt

@@ -22,6 +22,10 @@ import com.google.android.play.core.install.model.UpdateAvailability.DEVELOPER_T
 import com.google.android.play.core.install.model.UpdateAvailability.UPDATE_AVAILABLE
 import com.google.android.play.core.install.model.UpdateAvailability.UPDATE_NOT_AVAILABLE
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.wordpress.android.inappupdate.IInAppUpdateManager.Companion.APP_UPDATE_FLEXIBLE_REQUEST_CODE
 import org.wordpress.android.inappupdate.IInAppUpdateManager.Companion.APP_UPDATE_IMMEDIATE_REQUEST_CODE
 
@@ -33,6 +37,7 @@ import javax.inject.Singleton
 @Suppress("TooManyFunctions")
 class InAppUpdateManagerImpl(
     @ApplicationContext private val applicationContext: Context,
+    private val coroutineScope: CoroutineScope,
     private val appUpdateManager: AppUpdateManager,
     private val remoteConfigWrapper: RemoteConfigWrapper,
     private val buildConfigWrapper: BuildConfigWrapper,
@@ -51,8 +56,16 @@ class InAppUpdateManagerImpl(
     }
 
     override fun completeAppUpdate() {
-        inAppUpdateAnalyticsTracker.trackAppRestartToCompleteUpdate()
-        appUpdateManager.completeUpdate()
+        coroutineScope.launch(Dispatchers.Main) {
+            // Track the app restart to complete update
+            inAppUpdateAnalyticsTracker.trackAppRestartToCompleteUpdate()
+
+            // Delay so the event above can be logged
+            delay(RESTART_DELAY_IN_MILLIS)
+
+            // Complete the update
+            appUpdateManager.completeUpdate()
+        }
     }
 
     override fun cancelAppUpdate(updateType: Int) {
@@ -226,5 +239,6 @@ class InAppUpdateManagerImpl(
         private const val TAG = "AppUpdateChecker"
         private const val PREF_NAME = "in_app_update_prefs"
         private const val KEY_LAST_APP_UPDATE_CHECK_VERSION = "last_app_update_check_version"
+        private const val RESTART_DELAY_IN_MILLIS = 500L
     }
 }

WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java

@@ -28,19 +28,28 @@
 import org.wordpress.android.ui.sitecreation.SiteCreationStep;
 import org.wordpress.android.ui.sitecreation.SiteCreationStepsProvider;
 import org.wordpress.android.util.BuildConfigWrapper;
+import org.wordpress.android.util.audio.AudioRecorder;
+import org.wordpress.android.util.audio.IAudioRecorder;
+import org.wordpress.android.util.audio.RecordingStrategy;
+import org.wordpress.android.util.audio.RecordingStrategy.VoiceToContentRecordingStrategy;
+import org.wordpress.android.util.audio.VoiceToContentStrategy;
 import org.wordpress.android.util.config.InAppUpdatesFeatureConfig;
 import org.wordpress.android.util.config.RemoteConfigWrapper;
 import org.wordpress.android.util.wizard.WizardManager;
 import org.wordpress.android.viewmodel.helpers.ConnectionStatus;
 import org.wordpress.android.viewmodel.helpers.ConnectionStatusLiveData;
 
+import javax.inject.Named;
+
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.android.AndroidInjectionModule;
 import dagger.hilt.InstallIn;
 import dagger.hilt.android.qualifiers.ApplicationContext;
 import dagger.hilt.components.SingletonComponent;
+import kotlinx.coroutines.CoroutineScope;
+import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
 
 @InstallIn(SingletonComponent.class)
 @Module(includes = AndroidInjectionModule.class)
@@ -93,6 +102,7 @@ public static AppUpdateManager provideAppUpdateManager(@ApplicationContext Conte
     @Provides
     public static IInAppUpdateManager provideInAppUpdateManager(
             @ApplicationContext Context context,
+            @Named(APPLICATION_SCOPE) CoroutineScope appScope,
             AppUpdateManager appUpdateManager,
             RemoteConfigWrapper remoteConfigWrapper,
             BuildConfigWrapper buildConfigWrapper,
@@ -103,6 +113,7 @@ public static IInAppUpdateManager provideInAppUpdateManager(
         return inAppUpdatesFeatureConfig.isEnabled()
                 ? new InAppUpdateManagerImpl(
                 context,
+                appScope,
                 appUpdateManager,
                 remoteConfigWrapper,
                 buildConfigWrapper,
@@ -121,4 +132,19 @@ public static ActivityNavigator provideActivityNavigator(@ApplicationContext Con
     public static SensorManager provideSensorManager(@ApplicationContext Context context) {
         return (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
     }
+
+    @VoiceToContentStrategy
+    @Provides
+    public static IAudioRecorder provideAudioRecorder(
+            @ApplicationContext Context context,
+            @VoiceToContentStrategy RecordingStrategy recordingStrategy
+    ) {
+        return new AudioRecorder(context, recordingStrategy);
+    }
+
+    @VoiceToContentStrategy
+    @Provides
+    public static RecordingStrategy provideVoiceToContentRecordingStrategy() {
+        return new VoiceToContentRecordingStrategy();
+    }
 }

WordPress/src/main/java/org/wordpress/android/modules/ViewModelModule.java

@@ -54,7 +54,6 @@
 import org.wordpress.android.ui.reader.viewmodels.ReaderPostListViewModel;
 import org.wordpress.android.ui.reader.viewmodels.ReaderViewModel;
 import org.wordpress.android.ui.reader.viewmodels.SubfilterPageViewModel;
-import org.wordpress.android.ui.review.ReviewViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.DaysListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsDetailListViewModel;
 import org.wordpress.android.ui.stats.refresh.lists.InsightsListViewModel;
@@ -461,11 +460,6 @@ abstract class ViewModelModule {
     @ViewModelKey(UnifiedCommentListViewModel.class)
     abstract ViewModel unifiedCommentListViewModel(UnifiedCommentListViewModel viewModel);
 
-    @Binds
-    @IntoMap
-    @ViewModelKey(ReviewViewModel.class)
-    abstract ViewModel reviewViewModel(ReviewViewModel viewModel);
-
     @Binds
     @IntoMap
     @ViewModelKey(BloggingRemindersViewModel.class)

WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScanner.kt

@@ -18,21 +18,20 @@ import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.content.ContextCompat
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.flowOf
 import org.wordpress.android.ui.compose.theme.AppTheme
 import androidx.camera.core.Preview as CameraPreview
 
 @Composable
 fun BarcodeScanner(
     codeScanner: CodeScanner,
-    onScannedResult: (Flow<CodeScannerStatus>) -> Unit
+    onScannedResult: CodeScannerCallback
 ) {
     val context = LocalContext.current
     val lifecycleOwner = LocalLifecycleOwner.current
     val cameraProviderFuture = remember {
         ProcessCameraProvider.getInstance(context)
     }
+
     Column(
         modifier = Modifier.fillMaxSize()
     ) {
@@ -51,30 +50,27 @@ fun BarcodeScanner(
                     .setBackpressureStrategy(STRATEGY_KEEP_ONLY_LATEST)
                     .build()
                 imageAnalysis.setAnalyzer(ContextCompat.getMainExecutor(context)) { imageProxy ->
-                    onScannedResult(codeScanner.startScan(imageProxy))
+                    val callback = object : CodeScannerCallback {
+                        override fun run(status: CodeScannerStatus?) {
+                            status?.let { onScannedResult.run(it) }
+                        }
+                    }
+                    codeScanner.startScan(imageProxy, callback)
                 }
                 try {
                     cameraProviderFuture.get().bindToLifecycle(lifecycleOwner, selector, preview, imageAnalysis)
                 } catch (e: IllegalStateException) {
-                    onScannedResult(
-                        flowOf(
-                            CodeScannerStatus.Failure(
-                                e.message
-                                    ?: "Illegal state exception while binding camera provider to lifecycle",
-                                CodeScanningErrorType.Other(e)
-                            )
-                        )
-                    )
+                    onScannedResult.run(CodeScannerStatus.Failure(
+                        e.message
+                            ?: "Illegal state exception while binding camera provider to lifecycle",
+                        CodeScanningErrorType.Other(e)
+                    ))
                 } catch (e: IllegalArgumentException) {
-                    onScannedResult(
-                        flowOf(
-                            CodeScannerStatus.Failure(
-                                e.message
-                                    ?: "Illegal argument exception while binding camera provider to lifecycle",
-                                CodeScanningErrorType.Other(e)
-                            )
-                        )
-                    )
+                    onScannedResult.run(CodeScannerStatus.Failure(
+                        e.message
+                            ?: "Illegal argument exception while binding camera provider to lifecycle",
+                        CodeScanningErrorType.Other(e)
+                    ))
                 }
                 previewView
             },
@@ -84,8 +80,8 @@ fun BarcodeScanner(
 }
 
 class DummyCodeScanner : CodeScanner {
-    override fun startScan(imageProxy: ImageProxy): Flow<CodeScannerStatus> {
-        return flowOf(CodeScannerStatus.Success("", GoogleBarcodeFormatMapper.BarcodeFormat.FormatUPCA))
+    override fun startScan(imageProxy: ImageProxy, callback: CodeScannerCallback) {
+        callback.run(CodeScannerStatus.Success("", GoogleBarcodeFormatMapper.BarcodeFormat.FormatUPCA))
     }
 }
 
@@ -94,6 +90,10 @@ class DummyCodeScanner : CodeScanner {
 @Composable
 private fun BarcodeScannerScreenPreview() {
     AppTheme {
-        BarcodeScanner(codeScanner = DummyCodeScanner(), onScannedResult = {})
+        BarcodeScanner(codeScanner = DummyCodeScanner(), onScannedResult = object : CodeScannerCallback {
+            override fun run(status: CodeScannerStatus?) {
+                // no-ops
+            }
+        })
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/barcodescanner/BarcodeScannerScreen.kt

@@ -15,15 +15,14 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import org.wordpress.android.R
-import kotlinx.coroutines.flow.Flow
 import org.wordpress.android.ui.compose.theme.AppTheme
 
 @Composable
 fun BarcodeScannerScreen(
     codeScanner: CodeScanner,
     permissionState: BarcodeScanningViewModel.PermissionState,
     onResult: (Boolean) -> Unit,
-    onScannedResult: (Flow<CodeScannerStatus>) -> Unit,
+    onScannedResult: CodeScannerCallback,
 ) {
     val cameraPermissionLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.RequestPermission(),