From 185458d742817625d6275284c8c640b75afe5934 Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Fri, 3 Dec 2021 12:30:01 +0000 Subject: [PATCH 1/4] fix: Improve copy related to clearing user data Per UX assessment. --- app/src/main/res/values/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 45a2bbaf..a90638b1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,8 +92,9 @@ Total storage on device Clear all user data - Any data lost in transit will eventually reach its destination. It’d just take longer if - you delete it now. + You can delete all the data you’re currently transporting to free disk space. + Awala keeps backups of in-transit data, so deleting your copies now will simply + delay their delivery. Clear Are you sure? From e6885930a99d3349a6f9cf9bee526c936565ae27 Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Fri, 3 Dec 2021 12:36:25 +0000 Subject: [PATCH 2/4] make message more succinct --- app/src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a90638b1..3614df21 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -92,8 +92,7 @@ Total storage on device Clear all user data - You can delete all the data you’re currently transporting to free disk space. - Awala keeps backups of in-transit data, so deleting your copies now will simply + Awala keeps backups of in-transit data, so deleting your copies will simply delay their delivery. Clear From 76555db2e9a6a30ec846d709595595b0464cf8dd Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Fri, 3 Dec 2021 12:54:31 +0000 Subject: [PATCH 3/4] re-run flaky tests --- .../tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt b/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt index eacbbc8b..1d3e7353 100644 --- a/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt +++ b/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt @@ -4,6 +4,7 @@ import com.google.android.material.slider.Slider import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertDisabled import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertEnabled import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertContains +import com.schibsted.spain.barista.rule.flaky.AllowFlaky import junit.framework.TestCase.assertEquals import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking @@ -38,6 +39,7 @@ class SettingsActivityTest { } @Test + @AllowFlaky(attempts = 3) fun displaysVersion() { testRule.start() assertContains(BuildConfig.VERSION_CODE.toString()) @@ -51,6 +53,7 @@ class SettingsActivityTest { } @Test + @AllowFlaky(attempts = 3) fun clearButtonDisabledWithData() { runBlocking { storedMessageDao.insert(StoredMessageFactory.build()) From 15e171329331893050f200bad9a87088cee118fd Mon Sep 17 00:00:00 2001 From: Gus Narea Date: Fri, 3 Dec 2021 14:01:45 +0000 Subject: [PATCH 4/4] move flaky test retries to separate PR --- .../tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt b/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt index 1d3e7353..eacbbc8b 100644 --- a/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt +++ b/app/src/androidTest/java/tech/relaycorp/courier/ui/settings/SettingsActivityTest.kt @@ -4,7 +4,6 @@ import com.google.android.material.slider.Slider import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertDisabled import com.adevinta.android.barista.assertion.BaristaEnabledAssertions.assertEnabled import com.adevinta.android.barista.assertion.BaristaVisibilityAssertions.assertContains -import com.schibsted.spain.barista.rule.flaky.AllowFlaky import junit.framework.TestCase.assertEquals import kotlinx.coroutines.flow.first import kotlinx.coroutines.runBlocking @@ -39,7 +38,6 @@ class SettingsActivityTest { } @Test - @AllowFlaky(attempts = 3) fun displaysVersion() { testRule.start() assertContains(BuildConfig.VERSION_CODE.toString()) @@ -53,7 +51,6 @@ class SettingsActivityTest { } @Test - @AllowFlaky(attempts = 3) fun clearButtonDisabledWithData() { runBlocking { storedMessageDao.insert(StoredMessageFactory.build())