Removed auto-populating phone numbers

.circleci/test_modules.txt

@@ -17,3 +17,4 @@ crash-handler:testDebug
 entities:testDebug
 qr-code:testDebug
 shadows:testDebug
+metadata:testDebug

collect_app/build.gradle

@@ -267,6 +267,7 @@ dependencies {
     implementation project(':crash-handler')
     implementation project(':selfie-camera')
     implementation project(':qr-code')
+    implementation project(':metadata')
 
     if (getSecrets().getProperty('MAPBOX_DOWNLOADS_TOKEN', '') != '') {
         implementation project(':mapbox')

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

@@ -12,6 +12,7 @@
 import android.content.Context;
 
 import androidx.annotation.NonNull;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
@@ -45,9 +46,9 @@ public class BackgroundAudioRecordingTest {
 
     private StubAudioRecorder stubAudioRecorderViewModel;
 
-    private RevokeableRecordAudioPermissionsChecker permissionsChecker;
-    private ControllableRecordAudioPermissionsProvider permissionsProvider;
-    public final TestDependencies testDependencies = new TestDependencies() {
+    private final RevokeableRecordAudioPermissionsChecker permissionsChecker = new RevokeableRecordAudioPermissionsChecker(ApplicationProvider.getApplicationContext());
+    private final ControllableRecordAudioPermissionsProvider permissionsProvider = new ControllableRecordAudioPermissionsProvider(permissionsChecker);
+    private final TestDependencies testDependencies = new TestDependencies() {
 
         @Override
         public AudioRecorder providesAudioRecorder(Application application) {
@@ -68,19 +69,11 @@ public AudioRecorder providesAudioRecorder(Application application) {
 
         @Override
         public PermissionsChecker providesPermissionsChecker(Context context) {
-            if (permissionsChecker == null) {
-                permissionsChecker = new RevokeableRecordAudioPermissionsChecker(context);
-            }
-
             return permissionsChecker;
         }
 
         @Override
         public PermissionsProvider providesPermissionsProvider(PermissionsChecker permissionsChecker) {
-            if (permissionsProvider == null) {
-                permissionsProvider = new ControllableRecordAudioPermissionsProvider(permissionsChecker);
-            }
-
             return permissionsProvider;
         }
     };

collect_app/src/androidTest/java/org/odk/collect/android/feature/settings/FormMetadataSettingsTest.kt

@@ -1,69 +1,89 @@
 package org.odk.collect.android.feature.settings
 
-import android.content.Context
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
 import org.junit.runner.RunWith
 import org.odk.collect.android.R
 import org.odk.collect.android.injection.config.AppDependencyModule
-import org.odk.collect.android.metadata.InstallIDProvider
 import org.odk.collect.android.support.pages.MainMenuPage
 import org.odk.collect.android.support.pages.ProjectSettingsPage
 import org.odk.collect.android.support.pages.SaveOrIgnoreDialog
 import org.odk.collect.android.support.pages.UserAndDeviceIdentitySettingsPage
 import org.odk.collect.android.support.rules.CollectTestRule
 import org.odk.collect.android.support.rules.ResetStateRule
 import org.odk.collect.android.support.rules.TestRuleChain
-import org.odk.collect.android.utilities.DeviceDetailsProvider
+import org.odk.collect.metadata.InstallIDProvider
+import org.odk.collect.settings.SettingsProvider
 
 @RunWith(AndroidJUnit4::class)
 class FormMetadataSettingsTest {
-    private val deviceDetailsProvider: DeviceDetailsProvider = FakeDeviceDetailsProvider()
+    private val installIDProvider = FakeInstallIDProvider()
     var rule = CollectTestRule()
 
     @get:Rule
     var copyFormChain: RuleChain = TestRuleChain.chain()
         .around(
             ResetStateRule(
                 object : AppDependencyModule() {
-                    override fun providesDeviceDetailsProvider(
-                        context: Context,
-                        installIDProvider: InstallIDProvider
-                    ): DeviceDetailsProvider {
-                        return deviceDetailsProvider
+                    override fun providesInstallIDProvider(settingsProvider: SettingsProvider): InstallIDProvider {
+                        return installIDProvider
                     }
                 }
             )
         )
         .around(rule)
 
     @Test
-    fun settingMetadata_letsThemBeIncludedInAForm() {
+    fun metadataShouldBeDisplayedInPreferences() {
         rule.startAtMainMenu()
-            .copyForm("metadata.xml")
             .openProjectSettingsDialog()
             .clickSettings()
             .clickUserAndDeviceIdentity()
             .clickFormMetadata()
+
             .clickUsername()
             .inputText("Chino")
             .clickOKOnDialog()
-            .assertPreference(R.string.username, "Chino")
+            .clickPhoneNumber()
+            .inputText("123")
+            .clickOKOnDialog()
             .clickEmail()
             .inputText("[email protected]")
             .clickOKOnDialog()
+
+            .assertPreference(R.string.username, "Chino")
+            .assertPreference(R.string.phone_number, "123")
             .assertPreference(R.string.email, "[email protected]")
+            .assertPreference(R.string.device_id, installIDProvider.installID)
+    }
+
+    @Test
+    fun metadataShouldBeDisplayedInForm() {
+        rule.startAtMainMenu()
+            .copyForm("metadata.xml")
+
+            .openProjectSettingsDialog()
+            .clickSettings()
+            .clickUserAndDeviceIdentity()
+            .clickFormMetadata()
+            .clickUsername()
+            .inputText("Chino")
+            .clickOKOnDialog()
             .clickPhoneNumber()
             .inputText("664615")
             .clickOKOnDialog()
-            .assertPreference(R.string.phone_number, "664615")
+            .clickEmail()
+            .inputText("[email protected]")
+            .clickOKOnDialog()
             .pressBack(UserAndDeviceIdentitySettingsPage())
             .pressBack(ProjectSettingsPage())
             .pressBack(MainMenuPage())
+
+            // And verify that new metadata is displayed
             .startBlankForm("Metadata")
-            .assertTexts("Chino", "[email protected]", "664615")
+            .assertTexts("Chino", "664615", "[email protected]", installIDProvider.installID)
     }
 
     @Test // Issue number NODK-238 TestCase4 TestCase5
@@ -96,25 +116,6 @@ class FormMetadataSettingsTest {
             .assertText("Stephen")
     }
 
-    @Test
-    fun deviceIdentifiersAreDisplayedInSettings() {
-        rule.startAtMainMenu()
-            .copyForm("metadata.xml")
-            .openProjectSettingsDialog()
-            .clickSettings()
-            .clickUserAndDeviceIdentity()
-            .clickFormMetadata()
-            .assertPreference(R.string.device_id, deviceDetailsProvider.deviceId)
-    }
-
-    @Test
-    fun deviceIdentifiersCanBeIncludedInAForm() {
-        rule.startAtMainMenu()
-            .copyForm("metadata.xml")
-            .startBlankForm("Metadata")
-            .assertText(deviceDetailsProvider.deviceId)
-    }
-
     @Test // https://github.com/getodk/collect/issues/4792
     fun metadataProperties_shouldBeReloadedAfterSwitchingProjects() {
         rule.startAtMainMenu()
@@ -157,30 +158,21 @@ class FormMetadataSettingsTest {
 
             .clickFillBlankForm()
             .clickOnForm("Metadata")
-            .assertText("[email protected]")
-            .assertText("987654321")
-            .assertText("John Smith")
+            .assertTexts("[email protected]", "987654321", "John Smith")
             .swipeToEndScreen()
             .clickSaveAndExit()
 
             .openProjectSettingsDialog()
             .selectProject("Demo project")
             .clickFillBlankForm()
             .clickOnForm("Metadata")
-            .assertText("[email protected]")
-            .assertText("123456789")
-            .assertText("Demo user")
+            .assertTexts("[email protected]", "123456789", "Demo user")
             .swipeToEndScreen()
             .clickSaveAndExit()
     }
 
-    private class FakeDeviceDetailsProvider : DeviceDetailsProvider {
-        override fun getDeviceId(): String {
-            return "deviceID"
-        }
-
-        override fun getLine1Number(): String {
-            return "line1Number"
-        }
+    private class FakeInstallIDProvider : InstallIDProvider {
+        override val installID: String
+            get() = "deviceID"
     }
 }

collect_app/src/androidTest/java/org/odk/collect/android/support/rules/TestRuleChain.kt

@@ -23,7 +23,6 @@ object TestRuleChain {
                     Manifest.permission.ACCESS_COARSE_LOCATION,
                     Manifest.permission.READ_EXTERNAL_STORAGE,
                     Manifest.permission.CAMERA,
-                    Manifest.permission.READ_PHONE_STATE,
                     Manifest.permission.RECORD_AUDIO,
                     Manifest.permission.GET_ACCOUNTS
                 )

collect_app/src/main/AndroidManifest.xml

@@ -32,7 +32,6 @@ the specific language governing permissions and limitations under the License.
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />