Merge branch 'develop' into gutenberg/test-group-background-color

# Conflicts:
#	libs/gutenberg-mobile

.circleci/config.yml

@@ -635,28 +635,28 @@ workflows:
           requires: [gutenberg-bundle-build]
       - promo-screenshots:
           requires: [raw-screenshots]
-#  Release Build:
-#    unless: << pipeline.parameters.translation_review_build >>
-#    jobs:
-#      - gutenberg-bundle-build:
-#          filters:
-#            branches:
-#              ignore: /.*/
-#            tags:
-#              only: /^\d+(\.\d+)*(-rc-\d)?$/
-#      - lint:
-#          requires:
-#            - gutenberg-bundle-build
-#          filters:
-#            branches:
-#              ignore: /.*/
-#            tags:
-#              only: /^\d+(\.\d+)*(-rc-\d)?$/
-#      - Release Build:
-#          requires:
-#            - lint 
-#          filters:
-#            branches:
-#              ignore: /.*/
-#            tags:
-#              only: /^\d+(\.\d+)*(-rc-\d)?$/
+  Release Build:
+    unless: << pipeline.parameters.translation_review_build >>
+    jobs:
+      - gutenberg-bundle-build:
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^\d+(\.\d+)*(-rc-\d)?$/
+      - lint:
+          requires:
+            - gutenberg-bundle-build
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^\d+(\.\d+)*(-rc-\d)?$/
+      - Release Build:
+          requires:
+            - lint 
+          filters:
+            branches:
+              ignore: /.*/
+            tags:
+              only: /^\d+(\.\d+)*(-rc-\d)?$/

README.md

@@ -9,6 +9,7 @@ it on [Google Play](https://play.google.com/store/apps/details?id=org.wordpress.
 ## Build Instructions ##
 
 1. Make sure you've installed [Android Studio](https://developer.android.com/studio/index.html).
+1. Install npm using [Node Version Manager](https://github.com/nvm-sh/nvm)(nvm), as described in step one from the [Block Editor Quickstart guide](https://developer.wordpress.org/block-editor/tutorials/devenv/#quickstart)
 1. `git clone --recurse-submodules [email protected]:wordpress-mobile/WordPress-Android.git` in the folder of your preference.
 Or if you already have the project cloned, initialize and update the submodules:
 ```

RELEASE-NOTES.txt

@@ -1,6 +1,7 @@
 16.2
 -----
-
+* [*] Posts List: fixed bug that prevented showing the Featured Image of a post for pure self-hosted sites [https://github.com/wordpress-mobile/WordPress-Android/pull/13323]
+
 16.1
 -----
 * [***] Block Editor: Adds new option to select from a variety of predefined page templates when creating a new page for a Gutenberg site.

WordPress/build.gradle

@@ -54,9 +54,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-254"
+            versionName "alpha-256"
         }
-        versionCode 948
+        versionCode 953
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
 
@@ -76,6 +76,8 @@ android {
         buildConfigField "boolean", "WP_STORIES_AVAILABLE", "true"
         buildConfigField "boolean", "ANY_FILE_UPLOAD", "true"
         buildConfigField "boolean", "CONSOLIDATED_MEDIA_PICKER", "false"
+        buildConfigField "boolean", "ACTIVITY_LOG_FILTERS", "false"
+        buildConfigField "boolean", "SCAN_AVAILABLE", "false"
         buildConfigField "boolean", "ENABLE_FEATURE_CONFIGURATION", "true"
     }
 
@@ -93,9 +95,9 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "16.1-rc-1"
+                versionName "16.1-rc-3"
             }
-            versionCode 947
+            versionCode 952
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
             buildConfigField "boolean", "TENOR_AVAILABLE", "false"
             buildConfigField "long", "REMOTE_CONFIG_FETCH_INTERVAL", "3600"
@@ -185,6 +187,7 @@ androidExtensions {
 
 dependencies {
     implementation project(path:':libs:stories-android:stories')
+    testImplementation project(path:':photoeditor')
     implementation project(path:':libs:image-editor::ImageEditor')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
 
@@ -203,9 +206,10 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation "com.google.android.material:material:$materialVersion"
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
-    implementation "androidx.preference:preference:$materialVersion"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:$swipeToRefresh"
+    implementation "androidx.preference:preference:$preferenceVersion"
     implementation "androidx.work:work-runtime:$androidxWorkVersion"
     implementation "androidx.work:work-runtime-ktx:$androidxWorkVersion"
 
@@ -227,7 +231,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:18.1.0'
     implementation 'com.google.android.gms:play-services-places:17.0.0'
     implementation 'com.android.installreferrer:installreferrer:1.0'
-    implementation 'com.github.chrisbanes.photoview:library:1.2.4'
+    implementation 'com.github.chrisbanes:PhotoView:2.3.0'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation ('com.automattic:rest:1.0.8') {
         exclude group: 'com.mcxiaoke.volley'
@@ -238,10 +242,9 @@ dependencies {
     implementation 'com.squareup.okio:okio:2.8.0'
     implementation 'org.apache.commons:commons-text:1.1'
     implementation 'com.airbnb.android:lottie:3.0.7'
-    implementation 'com.facebook.shimmer:shimmer:0.4.0'
+    implementation 'com.facebook.shimmer:shimmer:0.5.0'
 
     implementation ("com.github.yalantis:ucrop:$uCropVersion") {
-        exclude group: 'com.squareup.okhttp3'
         exclude group: 'androidx.core', module: 'core'
         exclude group: 'androidx.constraintlayout', module: 'constraintlayout'
         exclude group: 'androidx.appcompat', module: 'appcompat'
@@ -326,6 +329,7 @@ dependencies {
 
     implementation (group: 'com.zendesk', name: 'support', version: '5.0.1') {
         exclude group: 'com.google.dagger'
+        exclude group: 'com.android.support', module: 'support-annotations'
     }
 
     implementation 'com.github.Tenor-Inc:tenor-android-core:0.5.1'

WordPress/src/androidTest/java/org/wordpress/android/support/MockingInterceptor.kt

@@ -12,8 +12,8 @@ class MockingInterceptor : Interceptor {
         val request = chain.request()
 
         // Redirect all WordPress.com API requests to local mock server
-        if (request.url().host() == "public-api.wordpress.com") {
-            val newUrl = request.url().newBuilder()
+        if (request.url.host == "public-api.wordpress.com") {
+            val newUrl = request.url.newBuilder()
                     .scheme("http")
                     .host("localhost")
                     .port(BaseTest.WIREMOCK_PORT)

WordPress/src/main/java/org/wordpress/android/WordPress.java

@@ -5,7 +5,6 @@
 import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
-import android.app.Service;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
 import android.content.Intent;
@@ -29,7 +28,6 @@
 import androidx.emoji.text.EmojiCompat;
 import androidx.emoji.text.EmojiCompat.InitCallback;
 import androidx.emoji.text.FontRequestEmojiCompatConfig;
-import androidx.fragment.app.Fragment;
 import androidx.lifecycle.Lifecycle;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.OnLifecycleEvent;
@@ -133,14 +131,12 @@
 
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
-import dagger.android.HasServiceInjector;
-import dagger.android.support.HasSupportFragmentInjector;
+import dagger.android.HasAndroidInjector;
 import kotlinx.coroutines.CoroutineScope;
 
 import static org.wordpress.android.modules.ThreadModuleKt.DEFAULT_SCOPE;
 
-public class WordPress extends MultiDexApplication implements HasServiceInjector, HasSupportFragmentInjector,
-        LifecycleObserver {
+public class WordPress extends MultiDexApplication implements HasAndroidInjector, LifecycleObserver {
     public static final String SITE = "SITE";
     public static final String LOCAL_SITE_ID = "LOCAL_SITE_ID";
     public static String versionName;
@@ -164,8 +160,7 @@ public class WordPress extends MultiDexApplication implements HasServiceInjector
 
     private static GoogleApiClient mCredentialsClient;
 
-    @Inject DispatchingAndroidInjector<Service> mServiceDispatchingAndroidInjector;
-    @Inject DispatchingAndroidInjector<Fragment> mSupportFragmentInjector;
+    @Inject DispatchingAndroidInjector<Object> mDispatchingAndroidInjector;
 
     @Inject Dispatcher mDispatcher;
     @Inject AccountStore mAccountStore;
@@ -855,13 +850,8 @@ public StoryNotificationTrackerProvider getStoryNotificationTrackerProvider() {
         return mStoryNotificationTrackerProvider;
     }
 
-    @Override
-    public AndroidInjector<Service> serviceInjector() {
-        return mServiceDispatchingAndroidInjector;
-    }
-
-    @Override public AndroidInjector<Fragment> supportFragmentInjector() {
-        return mSupportFragmentInjector;
+    @Override public AndroidInjector<Object> androidInjector() {
+        return mDispatchingAndroidInjector;
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)

WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java

@@ -187,6 +187,7 @@
 import org.wordpress.android.ui.themes.ThemeBrowserActivity;
 import org.wordpress.android.ui.themes.ThemeBrowserFragment;
 import org.wordpress.android.ui.uploads.MediaUploadHandler;
+import org.wordpress.android.ui.uploads.MediaUploadReadyProcessor;
 import org.wordpress.android.ui.uploads.PostUploadHandler;
 import org.wordpress.android.ui.uploads.UploadService;
 import org.wordpress.android.ui.whatsnew.FeatureAnnouncementDialogFragment;
@@ -595,6 +596,8 @@ public interface AppComponent extends AndroidInjector<WordPress> {
 
     void inject(MediaPickerFragment object);
 
+    void inject(MediaUploadReadyProcessor object);
+
     void inject(PrepublishingCategoriesFragment object);
 
     void inject(PrepublishingAddCategoryFragment object);