Merge branch 'develop' into issue/view-site-internal-browser

Author: malinajirka

.circleci/config.yml

@@ -71,6 +71,7 @@ jobs:
           type: instrumentation
           apk-path: WordPress/build/outputs/apk/vanilla/debug/WordPress-vanilla-debug.apk
           test-apk-path: WordPress/build/outputs/apk/androidTest/vanilla/debug/WordPress-vanilla-debug-androidTest.apk
+          test-targets: package org.wordpress.android.e2e
           device: model=Nexus5X,version=26,locale=en,orientation=portrait
           project: api-project-108380595987
           timeout: 10m

README.md

@@ -49,7 +49,6 @@ Using another account like bar@email.com will cause the `Client cannot use "pass
 
 For security reasons, some account-related actions aren't supported for development 
 builds when using a WordPress.com account with 2-factor authentication enabled.
-There is also currently an [issue](https://github.com/wordpress-mobile/WordPress-Android/issues/8754) where a restart of the app is required to complete login in this case. 
 
 Read more about [OAuth2][6] and the [WordPress.com REST endpoint][7].
 

RELEASE-NOTES.txt

@@ -1,7 +1,16 @@
+12.8
+-----
+
+
 12.7
 -----
 * Show upload in progress notification when retrying
 * Fix issue where two identical drafts were created
+* Block Editor: Fixed keyboard flickering issue after pressing Enter repeatedly on the Post Title.
+* Block Editor: New blocks are available: video/quote/more
+* Block Editor: performance improvements
+* Fixed issue where text appeared behind list of themes on the theme screen
+* Domain Registration functionality for Business plan customers on a site without a custom domain during plugin installation
 
 12.6
 -----
@@ -68,3 +77,4 @@
 * Updated Notifications with tabs
 * Add Posting activity block to the Stats/Insights
 * Fixed error notifications for failed uploads
+

WordPress/build.gradle

@@ -44,8 +44,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "alpha-172"
-        versionCode 734
+        versionName "alpha-175"
+        versionCode 741
         minSdkVersion 21
         targetSdkVersion 26
 

WordPress/metadata/PlayStoreStrings.po

@@ -11,20 +11,21 @@ msgstr ""
 "Project-Id-Version: Release Notes & Play Store Descriptions\n"
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
+msgctxt "release_note_127"
+msgid ""
+"12.7:\n"
+"* Quote and More blocks are now available, and we fixed an issue that caused the keyboard in the editor to flicker if you repeatedly pressed Enter on a post title.\n"
+"* Business plan customers can register a custom domain when installing a plugin.\n"
+"* Sometimes when you started a new draft, the app would create two. Fixed!\n"
+msgstr ""
+
 msgctxt "release_note_126"
 msgid ""
 "12.6:\n"
 "* Block Editor improvements: You’ll see clearer error messages when a block contains invalid content, and an issue in link settings (“Open in New Tab” was always OFF on open) is fixed.\n"
 "* Better offline support: If you draft a page while offline, the app will automatically upload it to the server as soon as an internet connection is available.\n"
 msgstr ""
 
-msgctxt "release_note_125"
-msgid ""
-"12.5:\n"
-"Better offline support: If you draft offline, drafts automatically upload to the server when you log in.\n"
-"Clearer stats: Navigate to a post’s detailed data by clicking on its title on the Stats screen. The current day’s stats appear in gray to help you remember that they’re not final.\n"
-msgstr ""
-
 msgctxt "sample_post_content"
 msgid "The best moment of any trip, for me, is when I first step foot off the plane. The whole of the trip is in front me, ripe with possibility."
 msgstr ""

WordPress/metadata/release_notes.txt

@@ -1,2 +1,3 @@
-* Block Editor improvements: You’ll see clearer error messages when a block contains invalid content, and an issue in link settings (“Open in New Tab” was always OFF on open) is fixed.
-* Better offline support: If you draft a page while offline, the app will automatically upload it to the server as soon as an internet connection is available.
+* Quote and More blocks are now available, and we fixed an issue that caused the keyboard in the editor to flicker if you repeatedly pressed Enter on a post title.
+* Business plan customers can register a custom domain when installing a plugin.
+* Sometimes when you started a new draft, the app would create two. Fixed!

WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/LoginFlow.java

@@ -12,7 +12,7 @@
 import org.wordpress.android.R;
 import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity;
 
-import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
@@ -76,7 +76,7 @@ private void chooseMagicLink(ActivityTestRule<LoginMagicLinkInterceptActivity> m
         // Follow the magic link to continue login
         // Intent is invoked directly rather than through a browser as WireMock is unavailable once in the background
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("wordpress://magic-login?token=valid_token"))
-                .setPackage(getTargetContext().getPackageName());
+                .setPackage(getApplicationContext().getPackageName());
         magicLinkActivityTestRule.launchActivity(intent);
     }
 

WordPress/src/androidTest/java/org/wordpress/android/e2e/flows/SignupFlow.java

@@ -9,7 +9,7 @@
 import org.wordpress.android.R;
 import org.wordpress.android.ui.accounts.LoginMagicLinkInterceptActivity;
 
-import static androidx.test.InstrumentationRegistry.getTargetContext;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.matcher.ViewMatchers.withHint;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
@@ -36,7 +36,7 @@ public void enterEmail(String email,
         Intent intent = new Intent(
                 Intent.ACTION_VIEW,
                 Uri.parse("wordpress://magic-login?token=valid_token&new_user=1")
-        ).setPackage(getTargetContext().getPackageName());
+        ).setPackage(getApplicationContext().getPackageName());
 
         magicLinkActivityTestRule.launchActivity(intent);
     }

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

@@ -5,7 +5,7 @@
 
 import org.wordpress.android.R;
 
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu;
 import static androidx.test.espresso.Espresso.pressBack;
@@ -76,7 +76,7 @@ public void enterImage() {
     }
 
     public void openSettings() {
-        openActionBarOverflowOrOptionsMenu(getInstrumentation().getTargetContext());
+        openActionBarOverflowOrOptionsMenu(getApplicationContext());
         clickOn(onView(withText("Post settings")));
     }
 

WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java

@@ -1,6 +1,7 @@
 package org.wordpress.android.support;
 
-import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
 import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
@@ -31,8 +32,7 @@ public class BaseTest {
 
     @Before
     public void setup() {
-        mAppContext =
-                (WordPress) InstrumentationRegistry.getInstrumentation().getTargetContext().getApplicationContext();
+        mAppContext = ApplicationProvider.getApplicationContext();
         mMockedAppComponent = DaggerAppComponentTest.builder()
                                                     .application(mAppContext)
                                                     .build();
@@ -41,7 +41,8 @@ public void setup() {
     @Rule
     public WireMockRule wireMockRule = new WireMockRule(
             options().port(WIREMOCK_PORT)
-                     .fileSource(new AssetFileSource(InstrumentationRegistry.getContext().getAssets()))
+                     .fileSource(new AssetFileSource(
+                             InstrumentationRegistry.getInstrumentation().getContext().getAssets()))
                      .extensions(new ResponseTemplateTransformer(true))
                      .notifier(new AndroidNotifier()));
     @Rule