Merge branch 'trunk' into issue/17279-blogging-reminders-resolver

Author: RenanLukas

RELEASE-NOTES.txt

@@ -2,8 +2,10 @@
 
 21.0
 -----
+* [***] Updated About screen for WordPress and Jetpack apps to their respective urls. [https://github.com/wordpress-mobile/WordPress-Android/pull/17282]
 * [*] Updates splash screen for Android 12+ [https://github.com/wordpress-mobile/WordPress-Android/pull/17273]
 * [*] Fix text color of success messages in the QR code login flow [https://github.com/wordpress-mobile/WordPress-Android/pull/17286]
+* [*] Stats: Fix Western Arabic Numerals not being shown on every text of the stats screens in Arabic languages [https://github.com/wordpress-mobile/WordPress-Android/pull/17217]
 
 20.9
 -----

WordPress/src/androidTest/java/org/wordpress/android/TestUtils.java

@@ -4,9 +4,10 @@
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.sqlite.SQLiteDatabase;
-import android.preference.PreferenceManager;
 import android.text.TextUtils;
 
+import androidx.preference.PreferenceManager;
+
 import org.greenrobot.eventbus.EventBus;
 import org.wordpress.android.util.DateTimeUtils;
 

WordPress/src/androidTest/java/org/wordpress/android/e2e/ContactUsTests.java

@@ -1,7 +1,6 @@
 package org.wordpress.android.e2e;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.e2e.pages.ContactSupportScreen;
@@ -18,7 +17,6 @@ public void setUp() {
         logoutIfNecessary();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eSendButtonEnabledWhenTextIsEntered() {
         try {
@@ -38,29 +36,6 @@ public void e2eSendButtonEnabledWhenTextIsEntered() {
         }
     }
 
-    @Ignore("As long as CI does not use gradle.properties from MobileSecrets")
-    @Test
-    public void e2eMessageCanBeSent() {
-        String userMessageText = "Please ignore, this is an automated test.";
-        String automatedReplyText = "Mobile support will respond as soon as possible, "
-                                    + "generally within 48-96 hours. "
-                                    + "Please reply with your site address (URL) "
-                                    + "and any additional details we should know.";
-
-        try {
-            new LoginFlow()
-                .chooseContinueWithWpCom()
-                .tapHelp()
-                .openContactUs()
-                .setMessageText(userMessageText)
-                .tapSendButton()
-                .assertUserMessageDelivered(userMessageText)
-                .assertSystemMessageReceived(automatedReplyText);
-        } finally {
-            new ContactSupportScreen().goBackAndDeleteUnsentMessageIfNeeded();
-        }
-    }
-
     @Test
     public void e2eHelpCanBeOpenedWhileEnteringEmail() {
         new LoginFlow()

WordPress/src/androidTest/java/org/wordpress/android/e2e/LoginTests.java

@@ -2,7 +2,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.support.BaseTest;
@@ -24,7 +23,6 @@ public void setUp() {
         logoutIfNecessary();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLoginWithEmailPassword() {
         new LoginFlow().chooseContinueWithWpCom()
@@ -33,7 +31,6 @@ public void e2eLoginWithEmailPassword() {
                        .confirmLogin(false);
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLoginWithPasswordlessAccount() {
         new LoginFlow().chooseContinueWithWpCom()
@@ -51,7 +48,6 @@ public void e2eLoginWithSiteAddress() {
                        .confirmLogin(false);
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLoginWithMagicLink() {
         new LoginFlow().chooseContinueWithWpCom()

WordPress/src/androidTest/java/org/wordpress/android/e2e/ReaderTests.java

@@ -5,7 +5,6 @@
 import androidx.test.rule.GrantPermissionRule;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.wordpress.android.e2e.pages.ReaderPage;
@@ -28,7 +27,6 @@ public void setUp() {
     String mCoachingPostTitle = "Let's check out the coaching team!";
     String mCompetitionPostTitle = "Let's focus on the competition.";
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eNavigateThroughPosts() {
         new ReaderPage()
@@ -42,7 +40,6 @@ public void e2eNavigateThroughPosts() {
                 .goBackToReader();
     }
 
-    @Ignore("Ignored temporarily. This sometimes fail on CI while running with whole test suite.")
     @Test
     public void e2eLikePost() {
         new ReaderPage()

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/BlockEditorPage.java

@@ -75,6 +75,7 @@ public BlockEditorPage addPostSettings(String categoryName, String tagName) {
     }
 
     public void openPostSetting() {
+        waitForElementToBeDisplayed(R.id.toolbar_main);
         openActionBarOverflowOrOptionsMenu(ApplicationProvider.getApplicationContext());
         clickOn(onView(withText(R.string.post_settings)));
     }
@@ -141,8 +142,8 @@ public BlockEditorPage addImage() {
         clickOn("Image");
         clickOn("WordPress Media Library");
         waitForElementToBeDisplayed(onView(withText("WordPress media")));
-        waitForElementToBeDisplayed(onView(withIndex(withId(R.id.image_thumbnail), 0)));
-        onView(withIndex(withId(R.id.image_thumbnail), 0)).perform(click());
+        waitForElementToBeDisplayed(onView(withIndex(withId(R.id.text_selection_count), 0)));
+        onView(withIndex(withId(R.id.text_selection_count), 0)).perform(click());
         clickOn(R.id.mnu_confirm_selection);
         return this;
     }

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/ContactSupportScreen.java

@@ -8,7 +8,6 @@
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isCompletelyDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.isEnabled;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
@@ -42,11 +41,6 @@ public class ContactSupportScreen {
     ));
 
     // Actions:
-    public ContactSupportScreen tapSendButton() {
-        sendButton.perform(ViewActions.click());
-        return this;
-    }
-
     public ContactSupportScreen setMessageText(String text) {
         populateTextField(textInput, text);
         // This sleep serves only one purpose: allowing human to notice
@@ -74,6 +68,7 @@ public HelpAndSupportScreen goBackAndDeleteUnsentMessageIfNeeded() {
 
     // Assertions:
     public ContactSupportScreen assertContactSupportScreenLoaded() {
+        waitForElementToBeDisplayed(textInput);
         textInput.check(matches(isCompletelyDisplayed()));
         sendButton.check(matches(isCompletelyDisplayed()));
         return this;
@@ -88,32 +83,4 @@ public ContactSupportScreen assertSendButtonEnabled() {
         sendButton.check(matches(isEnabled()));
         return this;
     }
-
-    public ContactSupportScreen assertUserMessageDelivered(String messageText) {
-        ViewInteraction userMessageContainer = onView(allOf(
-                withId(R.id.request_user_message_container),
-                hasDescendant(allOf(
-                        withId(R.id.request_user_message_text),
-                        withText(messageText)
-                )),
-                hasDescendant(allOf(
-                        withId(R.id.request_user_message_status),
-                        withText("Delivered")
-                ))
-        ));
-
-        waitForElementToBeDisplayed(userMessageContainer);
-        userMessageContainer.check(matches(isCompletelyDisplayed()));
-        return this;
-    }
-
-    public ContactSupportScreen assertSystemMessageReceived(String messageText) {
-        ViewInteraction systemResponseBubble = onView(allOf(
-                withId(R.id.request_system_message_text),
-                withText(messageText)));
-
-        waitForElementToBeDisplayed(systemResponseBubble);
-        systemResponseBubble.check(matches(isCompletelyDisplayed()));
-        return this;
-    }
 }

WordPress/src/androidTest/java/org/wordpress/android/util/StatsMocksReader.kt

@@ -5,11 +5,10 @@ import org.json.JSONObject
 import java.util.ArrayList
 
 class StatsMocksReader {
-    fun readDayStatsGenericFile(fileName: String, lastObjectName: String, keyName: String, valueName: String):
+    private fun readDayStatsGenericFile(fileName: String, lastObjectName: String, keyName: String, valueName: String):
             MutableList<StatsKeyValueData> {
-        val fileName = "mocks/mappings/wpcom/stats/$fileName.json"
         val todayMarker = "{{now format='yyyy-MM-dd'}}"
-        val readString = this.readAssetsFile(fileName)
+        val readString = this.readAssetsFile("mocks/mappings/wpcom/stats/$fileName.json")
         val wireMockJSON = JSONObject(readString)
         val arrayRaw = wireMockJSON
                 .getJSONObject("response")
@@ -58,7 +57,7 @@ class StatsMocksReader {
     }
 
     fun readDayCountriesToList(): MutableList<StatsKeyValueData> {
-        var countriesList = readDayStatsGenericFile(
+        val countriesList = readDayStatsGenericFile(
                 "stats_country-views-day", "views", "country_code", "views"
         )
 

WordPress/src/debug/java/org/wordpress/android/WPWellSqlConfig.kt

@@ -19,6 +19,7 @@ class WPWellSqlConfig(context: Context) : WellSqlConfig(context) {
      * and show a toast alerting to the downgrade. The sole purpose of this is to avoid the hassle of devs switching
      * branches and having to clear storage and login again due to a version downgrade.
      */
+    @Suppress("DEPRECATION")
     override fun onDowngrade(db: SQLiteDatabase?, helper: WellTableManager?, oldVersion: Int, newVersion: Int) {
         if (BuildConfig.RESET_DB_ON_DOWNGRADE.toBoolean()) {
             // note: don't call super() here because it throws an exception

WordPress/src/jetpack/java/org/wordpress/android/ui/accounts/login/LoginPrologueFragment.kt

@@ -27,6 +27,7 @@ class LoginPrologueFragment : Fragment(R.layout.jetpack_login_prologue_screen) {
         loginPrologueListener = context
     }
 
+    @Suppress("DEPRECATION")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -79,7 +80,7 @@ class LoginPrologueFragment : Fragment(R.layout.jetpack_login_prologue_screen) {
         viewModel.onFragmentResume()
     }
 
-    @Suppress("DEPRECATION")
+    @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         // important for accessibility - talkback
@@ -91,6 +92,7 @@ class LoginPrologueFragment : Fragment(R.layout.jetpack_login_prologue_screen) {
         updateSystemBars(showDarkStatusAndNavBarInLightMode = false)
     }
 
+    @Suppress("DEPRECATION")
     private fun updateSystemBars(showDarkStatusAndNavBarInLightMode: Boolean) {
         activity?.let {
             WPActivityUtils.setLightStatusBar(it.window, !showDarkStatusAndNavBarInLightMode)