Fixed starting activities

androidshared/build.gradle

@@ -61,6 +61,7 @@ dependencies {
     testImplementation Dependencies.androidx_test_ext_junit
     testImplementation Dependencies.androidx_test_espresso_core
     testImplementation Dependencies.robolectric
+    testImplementation Dependencies.mockito_kotlin
 
     debugImplementation project(':fragmentstest')
 }

androidshared/src/main/java/org/odk/collect/androidshared/system/IntentLauncher.kt

@@ -0,0 +1,59 @@
+package org.odk.collect.androidshared.system
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
+
+object IntentLauncherImpl : IntentLauncher {
+    override fun launch(context: Context, intent: Intent?, onError: () -> Unit) {
+        try {
+            context.startActivity(intent)
+        } catch (e: Exception) {
+            onError()
+        } catch (e: Error) {
+            onError()
+        }
+    }
+
+    override fun launchForResult(
+        activity: Activity,
+        intent: Intent?,
+        requestCode: Int,
+        onError: () -> Unit
+    ) {
+        try {
+            activity.startActivityForResult(intent, requestCode)
+        } catch (e: Exception) {
+            onError()
+        } catch (e: Error) {
+            onError()
+        }
+    }
+
+    override fun launchForResult(
+        resultLauncher: ActivityResultLauncher<Intent>,
+        intent: Intent?,
+        onError: () -> Unit
+    ) {
+        try {
+            resultLauncher.launch(intent)
+        } catch (e: Exception) {
+            onError()
+        } catch (e: Error) {
+            onError()
+        }
+    }
+}
+
+interface IntentLauncher {
+    fun launch(context: Context, intent: Intent?, onError: () -> Unit)
+
+    fun launchForResult(activity: Activity, intent: Intent?, requestCode: Int, onError: () -> Unit)
+
+    fun launchForResult(
+        resultLauncher: ActivityResultLauncher<Intent>,
+        intent: Intent?,
+        onError: () -> Unit
+    )
+}

androidshared/src/test/java/org/odk/collect/androidshared/utils/IntentLauncherImplTest.kt

@@ -0,0 +1,103 @@
+package org.odk.collect.androidshared.utils
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import androidx.activity.result.ActivityResultLauncher
+import org.junit.Test
+import org.mockito.kotlin.mock
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.verifyNoMoreInteractions
+import org.mockito.kotlin.whenever
+import org.odk.collect.androidshared.system.IntentLauncherImpl
+import java.lang.Exception
+
+class IntentLauncherImplTest {
+    private val context = mock<Context>()
+    private val activity = mock<Activity>()
+    private val activityResultLauncher = mock<ActivityResultLauncher<Intent>>()
+    private val intent = mock<Intent>()
+    private val onError = mock<() -> Unit>()
+    private val intentLauncher = IntentLauncherImpl
+
+    @Test
+    fun `startActivity with given intent should be called on the context when calling IntentLauncher#launch(context, intent, onError)`() {
+        intentLauncher.launch(context, intent, onError)
+        verify(context).startActivity(intent)
+        verifyNoMoreInteractions(onError)
+    }
+
+    @Test
+    fun `onError should be called if any exception occurs when calling IntentLauncher#launch(context, intent, onError)`() {
+        whenever(context.startActivity(intent)).then {
+            throw Exception()
+        }
+        intentLauncher.launch(context, intent, onError)
+        verify(onError).invoke()
+    }
+
+    @Test
+    fun `onError should be called if any error occurs when calling IntentLauncher#launch(context, intent, onError)`() {
+        whenever(context.startActivity(intent)).then {
+            throw Error()
+        }
+        intentLauncher.launch(context, intent, onError)
+        verify(onError).invoke()
+    }
+
+    @Test
+    fun `startActivityForResult with given intent should be called on the context when calling IntentLauncher#launchForResult(context, intent, requestCode, onError)`() {
+        intentLauncher.launchForResult(activity, intent, 1, onError)
+        verify(activity).startActivityForResult(intent, 1)
+        verifyNoMoreInteractions(onError)
+    }
+
+    @Test
+    fun `onError should be called if any exception occurs when calling IntentLauncher#launchForResult(context, intent, requestCode, onError)`() {
+        whenever(activity.startActivityForResult(intent, 1)).then {
+            throw Exception()
+        }
+        intentLauncher.launchForResult(activity, intent, 1, onError)
+        verify(onError).invoke()
+    }
+
+    @Test
+    fun `onError should be called if any error occurs when calling IntentLauncher#launchForResult(context, intent, requestCode, onError)`() {
+        whenever(activity.startActivityForResult(intent, 1)).then {
+            throw Error()
+        }
+        intentLauncher.launchForResult(activity, intent, 1, onError)
+        verify(onError).invoke()
+    }
+
+    @Test
+    fun `startActivityForResult with given intent should be called on the context when calling IntentLauncher#launchForResult(resultLauncher, intent, onError)`() {
+        intentLauncher.launchForResult(activityResultLauncher, intent, onError)
+        verify(activityResultLauncher).launch(intent)
+        verifyNoMoreInteractions(onError)
+    }
+
+    @Test
+    fun `onError should not be called if no exception occurs when calling IntentLauncher#launchForResult(resultLauncher, intent, onError)`() {
+        intentLauncher.launchForResult(activityResultLauncher, intent, onError)
+        verifyNoMoreInteractions(onError)
+    }
+
+    @Test
+    fun `onError should be called if any exception occurs when calling IntentLauncher#launchForResult(resultLauncher, intent, onError)`() {
+        whenever(activityResultLauncher.launch(intent)).then {
+            throw Exception()
+        }
+        intentLauncher.launchForResult(activityResultLauncher, intent, onError)
+        verify(onError).invoke()
+    }
+
+    @Test
+    fun `onError should be called if any error occurs when calling IntentLauncher#launchForResult(resultLauncher, intent, onError)`() {
+        whenever(activityResultLauncher.launch(intent)).then {
+            throw Error()
+        }
+        intentLauncher.launchForResult(activityResultLauncher, intent, onError)
+        verify(onError).invoke()
+    }
+}

collect_app/src/androidTest/java/org/odk/collect/android/feature/formentry/ExternalAudioRecordingTest.java

@@ -3,7 +3,6 @@
 import android.Manifest;
 import android.app.Activity;
 import android.app.Instrumentation;
-import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.MediaStore;
@@ -19,10 +18,8 @@
 import org.odk.collect.android.RecordedIntentsRule;
 import org.odk.collect.android.support.CollectTestRule;
 import org.odk.collect.android.support.RunnableRule;
-import org.odk.collect.android.support.TestDependencies;
 import org.odk.collect.android.support.TestRuleChain;
 import org.odk.collect.android.support.pages.MainMenuPage;
-import org.odk.collect.android.utilities.ActivityAvailability;
 
 import java.io.File;
 import java.io.IOException;
@@ -34,22 +31,10 @@
 @RunWith(AndroidJUnit4.class)
 public class ExternalAudioRecordingTest {
 
-    public final TestDependencies testDependencies = new TestDependencies() {
-        @Override
-        public ActivityAvailability providesActivityAvailability(Context context) {
-            return new ActivityAvailability(context) {
-                @Override
-                public boolean isActivityAvailable(Intent intent) {
-                    return true;
-                }
-            };
-        }
-    };
-
     public final CollectTestRule rule = new CollectTestRule();
 
     @Rule
-    public final RuleChain chain = TestRuleChain.chain(testDependencies)
+    public final RuleChain chain = TestRuleChain.chain()
             .around(GrantPermissionRule.grant(Manifest.permission.RECORD_AUDIO))
             .around(new RecordedIntentsRule())
             .around(new RunnableRule(() -> {

collect_app/src/androidTest/java/org/odk/collect/android/feature/smoke/AllWidgetsFormTest.java

@@ -1,17 +1,12 @@
 package org.odk.collect.android.feature.smoke;
 
-import android.content.Context;
-
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
-import org.odk.collect.android.injection.config.AppDependencyModule;
 import org.odk.collect.android.support.CopyFormRule;
 import org.odk.collect.android.support.FormActivityTestRule;
-import org.odk.collect.android.support.ResetStateRule;
-import org.odk.collect.android.utilities.ActivityAvailability;
 
 import tools.fastlane.screengrab.Screengrab;
 import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy;
@@ -25,7 +20,6 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.startsWith;
-import static org.mockito.Mockito.mock;
 
 /**
  * Integration test that runs through a form with all question types.
@@ -36,22 +30,14 @@
  */
 public class AllWidgetsFormTest {
 
-    private final ActivityAvailability activityAvailability = mock(ActivityAvailability.class);
-
     @ClassRule
     public static final LocaleTestRule LOCALE_TEST_RULE = new LocaleTestRule();
 
     public FormActivityTestRule activityTestRule = new FormActivityTestRule("all-widgets.xml");
 
     @Rule
     public RuleChain copyFormChain = RuleChain
-            .outerRule(new ResetStateRule(new AppDependencyModule() {
-                @Override
-                public ActivityAvailability providesActivityAvailability(Context context) {
-                    return activityAvailability;
-                }
-            }))
-            .around(new CopyFormRule("all-widgets.xml", true))
+            .outerRule(new CopyFormRule("all-widgets.xml", true))
             .around(activityTestRule);
 
     @BeforeClass

collect_app/src/main/java/org/odk/collect/android/activities/AboutActivity.java

@@ -16,13 +16,9 @@
 
 package org.odk.collect.android.activities;
 
-import android.content.ComponentName;
 import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.widget.Toast;
 
 import androidx.appcompat.widget.Toolbar;
 import androidx.recyclerview.widget.DefaultItemAnimator;
@@ -31,13 +27,12 @@
 
 import org.odk.collect.android.R;
 import org.odk.collect.android.adapters.AboutListAdapter;
-import org.odk.collect.android.application.Collect;
+import org.odk.collect.android.injection.DaggerUtils;
 import org.odk.collect.android.utilities.ExternalWebPageHelper;
 import org.odk.collect.android.utilities.MultiClickGuard;
+import org.odk.collect.androidshared.system.IntentLauncher;
 
-import java.util.List;
-
-import timber.log.Timber;
+import javax.inject.Inject;
 
 public class AboutActivity extends CollectAbstractActivity implements
         AboutListAdapter.AboutItemClickListener {
@@ -50,10 +45,15 @@ public class AboutActivity extends CollectAbstractActivity implements
     private Uri websiteUri;
     private Uri forumUri;
 
+    @Inject
+    IntentLauncher intentLauncher;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.about_layout);
+        DaggerUtils.getComponent(this).inject(this);
+
         initToolbar();
 
         int[][] items = {
@@ -103,37 +103,16 @@ public void onClick(int position) {
                             getString(R.string.tell_your_friends)));
                     break;
                 case 3:
-                    boolean intentStarted = false;
-                    try {
-                        // Open the google play store app if present
-                        Intent intent = new Intent(Intent.ACTION_VIEW,
-                                Uri.parse("market://details?id=" + getPackageName()));
-                        List<ResolveInfo> list = getPackageManager().queryIntentActivities(intent, 0);
-                        for (ResolveInfo info : list) {
-                            ActivityInfo activity = info.activityInfo;
-                            if (activity.name.contains("com.google.android")) {
-                                ComponentName name = new ComponentName(
-                                        activity.applicationInfo.packageName,
-                                        activity.name);
-                                intent.setComponent(name);
-                                startActivity(intent);
-                                intentStarted = true;
-                            }
-                        }
-                    } catch (android.content.ActivityNotFoundException anfe) {
-                        Toast.makeText(Collect.getInstance(),
-                                getString(R.string.activity_not_found, "market view"),
-                                Toast.LENGTH_SHORT).show();
-                        Timber.d(anfe);
-                    }
-                    if (!intentStarted) {
+                    Intent intent = new Intent(Intent.ACTION_VIEW,
+                            Uri.parse("market://details?id=" + getPackageName()));
+                    intentLauncher.launch(this, intent, () -> {
                         // Show a list of all available browsers if user doesn't have a default browser
-                        startActivity(new Intent(Intent.ACTION_VIEW,
-                                Uri.parse(GOOGLE_PLAY_URL + getPackageName())));
-                    }
+                        startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(GOOGLE_PLAY_URL + getPackageName())));
+                        return null;
+                    });
                     break;
                 case 4:
-                    Intent intent = new Intent(this, WebViewActivity.class);
+                    intent = new Intent(this, WebViewActivity.class);
                     intent.putExtra(ExternalWebPageHelper.OPEN_URL, LICENSES_HTML_PATH);
                     startActivity(intent);
                     break;