wordpress-mobile · oguzkocer · Mar 11, 2020 · Dec 19, 2019 · Dec 20, 2019 · Dec 20, 2019
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -141,7 +141,7 @@ GEM
     multipart-post (2.0.0)
     nanaimo (0.2.6)
     naturally (2.2.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
@@ -216,4 +216,4 @@ DEPENDENCIES
   rmagick (~> 3.2.0)
 
 BUNDLED WITH
-   2.1.1
+   2.1.4
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -1,5 +1,9 @@
+14.5
+-----
+
 14.4
 -----
+* Fix an issue where image is sometimes uploaded with a path to local storage
 
 14.3
 -----

diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -55,9 +55,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-211"
+            versionName "alpha-212"
         }
-        versionCode 835
+        versionCode 838
         minSdkVersion 21
         targetSdkVersion 28
 
@@ -83,9 +83,9 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "14.3"
+                versionName "14.4-rc-1"
             }
-            versionCode 836
+            versionCode 837
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
         }
 

diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po
@@ -11,6 +11,14 @@ 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_144"
+msgid ""
+"14.4:\n"
+"One small fix: this release takes care of an issue that caused images to upload with wonky URLs, which made them inaccessible on your website.\n"
+"\n"
+"Wash your hands and stay safe, everyone.\n"
+msgstr ""
+
 msgctxt "release_note_143"
 msgid ""
 "14.3:\n"
@@ -21,19 +29,6 @@ msgid ""
 "\n"
 msgstr ""
 
-msgctxt "release_note_142"
-msgid ""
-"14.2:\n"
-"Lots of updates to the block editor:\n"
-"\n"
-"* Added a long-press icon for adding blocks before/after.\n"
-"* App will try to display images when coming back online after a disconnection.\n"
-"* Resolved issue with blank editor when trying to create a post with images or links from another app.\n"
-"* Added image size options to the Gallery block.\n"
-"* Fixed a bug that prevented paragraph blocks from merging.\n"
-"\n"
-msgstr ""
-
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!
 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."

diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1,4 +1,3 @@
-- Block editor additions: Added Button and Group blocks, and support for more options in Image and Gallery block settings.
-- Block editor enhancements: Added scroll support inside block picker and block settings, and introduced a floating toolbar to make navigating blocks easier.
-- Block editor fixes: Fixed issues around placeholder images during image upload, emojis in post titles, and text-wrapping in Shortcode blocks.
-- Reader: Added tab filtering for better sites/tag navigation.
+One small fix: this release takes care of an issue that caused images to upload with wonky URLs, which made them inaccessible on your website.
+
+Wash your hands and stay safe, everyone.
diff --git a/WordPress/src/androidTest/java/org/wordpress/android/modules/AppComponentTest.kt b/WordPress/src/androidTest/java/org/wordpress/android/modules/AppComponentTest.kt
@@ -26,6 +26,7 @@ import javax.inject.Singleton
     AndroidSupportInjectionModule::class,
     ViewModelModule::class,
     StatsModule::class,
+    TrackerTestModule::class,
     // Login flow library
     LoginAnalyticsModule::class,
     LoginFragmentModule::class,

diff --git a/WordPress/src/androidTest/java/org/wordpress/android/modules/TrackerTestModule.kt b/WordPress/src/androidTest/java/org/wordpress/android/modules/TrackerTestModule.kt
@@ -0,0 +1,14 @@
+package org.wordpress.android.modules
+
+import dagger.Module
+import dagger.Provides
+import org.mockito.Mockito
+import org.wordpress.android.analytics.Tracker
+
+@Module
+class TrackerTestModule {
+    @Provides
+    fun provideTracker(): Tracker {
+        return Mockito.mock(Tracker::class.java)
+    }
+}
diff --git a/WordPress/src/debug/java/org/wordpress/android/modules/AppComponentDebug.java b/WordPress/src/debug/java/org/wordpress/android/modules/AppComponentDebug.java
@@ -29,6 +29,7 @@
         AndroidSupportInjectionModule.class,
         ViewModelModule.class,
         StatsModule.class,
+        TrackerModule.class,
         // Login flow library
         LoginAnalyticsModule.class,
         LoginFragmentModule.class,

diff --git a/WordPress/src/main/AndroidManifest.xml b/WordPress/src/main/AndroidManifest.xml
@@ -269,7 +269,7 @@
             android:theme="@style/Calypso.NoActionBar" />
         <activity
             android:name=".ui.stats.refresh.lists.sections.insights.management.InsightsManagementActivity"
-            android:label="@string/stats_manage_insights"
+            android:label="@string/stats_management_screen_title"
             android:launchMode="singleTop"
             android:theme="@style/CalypsoTheme" />
         <activity

diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java
@@ -44,7 +44,7 @@
 import org.greenrobot.eventbus.ThreadMode;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.analytics.AnalyticsTracker.Stat;
-import org.wordpress.android.analytics.AnalyticsTrackerNosara;
+import org.wordpress.android.analytics.Tracker;
 import org.wordpress.android.datasets.NotificationsTable;
 import org.wordpress.android.datasets.ReaderDatabase;
 import org.wordpress.android.fluxc.Dispatcher;
@@ -154,6 +154,9 @@ public class WordPress extends MultiDexApplication implements HasServiceInjector
     @Inject SystemNotificationsTracker mSystemNotificationsTracker;
     @Inject ReaderTracker mReaderTracker;
 
+    // For development and production `AnalyticsTrackerNosara`, for testing a mocked `Tracker` will be injected.
+    @Inject Tracker mTracker;
+
     @Inject @Named("custom-ssl") RequestQueue mRequestQueue;
     public static RequestQueue sRequestQueue;
     @Inject FluxCImageLoader mImageLoader;
@@ -397,7 +400,7 @@ private void createNotificationChannelsOnSdk26() {
     }
 
     private void initAnalytics(final long elapsedTimeOnCreate) {
-        AnalyticsTracker.registerTracker(new AnalyticsTrackerNosara(getContext()));
+        AnalyticsTracker.registerTracker(mTracker);
         AnalyticsTracker.init(getContext());
 
         AnalyticsUtils.refreshMetadata(mAccountStore, mSiteStore);

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java b/WordPress/src/main/java/org/wordpress/android/modules/AppComponent.java
@@ -182,6 +182,7 @@
         StatsModule.class,
         SupportModule.class,
         ThreadModule.class,
+        TrackerModule.class,
         // Login flow library
         LoginAnalyticsModule.class,
         LoginFragmentModule.class,

diff --git a/WordPress/src/main/java/org/wordpress/android/modules/TrackerModule.kt b/WordPress/src/main/java/org/wordpress/android/modules/TrackerModule.kt
@@ -0,0 +1,15 @@
+package org.wordpress.android.modules
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import org.wordpress.android.analytics.AnalyticsTrackerNosara
+import org.wordpress.android.analytics.Tracker
+
+@Module
+class TrackerModule {
+    @Provides
+    fun provideTracker(appContext: Context): Tracker {
+        return AnalyticsTrackerNosara(appContext)
+    }
+}
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerActivity.java
@@ -220,11 +220,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 if (data != null) {
                     int newSiteLocalID = data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1);
                     SiteUtils.enableBlockEditorOnSiteCreation(mDispatcher, mSiteStore, newSiteLocalID);
-                    // Mark the site to show the GB popup at first editor run
-                    SiteModel newSiteModel = mSiteStore.getSiteByLocalId(newSiteLocalID);
-                    if (newSiteModel != null) {
-                        AppPrefs.setShowGutenbergInfoPopupForTheNewPosts(newSiteModel.getUrl(), true);
-                    }
                 }
                 break;
         }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -900,11 +900,6 @@ public void onClick(View v) {
                 if (data != null) {
                     int newSiteLocalID = data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1);
                     SiteUtils.enableBlockEditorOnSiteCreation(mDispatcher, mSiteStore, newSiteLocalID);
-                    // Mark the site to show the GB popup at first editor run
-                    SiteModel newSiteModel = mSiteStore.getSiteByLocalId(newSiteLocalID);
-                    if (newSiteModel != null) {
-                        AppPrefs.setShowGutenbergInfoPopupForTheNewPosts(newSiteModel.getUrl(), true);
-                    }
                 }
 
                 setSite(data);

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
@@ -1405,7 +1405,6 @@ private void setGutenbergEnabledIfNeeded() {
             SiteUtils.enableBlockEditor(mDispatcher, mSite);
             AnalyticsUtils.trackWithSiteDetails(Stat.EDITOR_GUTENBERG_ENABLED, mSite,
                     BlockEditorEnabledSource.ON_BLOCK_POST_OPENING.asPropertyMap());
-            showPopup = true;
         }
 
         if (showPopup) {
@@ -2673,6 +2672,14 @@ public void onEditorFragmentContentReady(ArrayList<Object> unsupportedBlocksList
         mPostEditorAnalyticsSession.start(unsupportedBlocksList);
     }
 
+    @Override public void onGutenbergEditorSessionTemplateApplyTracked(String template) {
+        mPostEditorAnalyticsSession.applyTemplate(template);
+    }
+
+    @Override public void onGutenbergEditorSessionTemplatePreviewTracked(String template) {
+        mPostEditorAnalyticsSession.previewTemplate(template);
+    }
+
     @Override
     public void onHtmlModeToggledInToolbar() {
         toggleHtmlModeOnMenu();

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostEditorAnalyticsSession.java
@@ -26,6 +26,7 @@ public class PostEditorAnalyticsSession implements Serializable {
     private static final String KEY_POST_TYPE = "post_type";
     private static final String KEY_OUTCOME = "outcome";
     private static final String KEY_SESSION_ID = "session_id";
+    private static final String KEY_TEMPLATE = "template";
 
     private String mSessionId = UUID.randomUUID().toString();
     private String mPostType;
@@ -35,6 +36,7 @@ public class PostEditorAnalyticsSession implements Serializable {
     private Editor mCurrentEditor;
     private boolean mHasUnsupportedBlocks = false;
     private Outcome mOutcome = null;
+    private String mTemplate;
     private boolean mHWAccOff = false;
 
     enum Editor {
@@ -113,6 +115,19 @@ public void setOutcome(Outcome newOutcome) {
         mOutcome = newOutcome;
     }
 
+    public void previewTemplate(String template) {
+        final Map<String, Object> properties = getCommonProperties();
+        properties.put(KEY_TEMPLATE, template);
+        AnalyticsTracker.track(Stat.EDITOR_SESSION_TEMPLATE_PREVIEW, properties);
+    }
+
+    public void applyTemplate(String template) {
+        mTemplate = template;
+        final Map<String, Object> properties = getCommonProperties();
+        properties.put(KEY_TEMPLATE, template);
+        AnalyticsTracker.track(Stat.EDITOR_SESSION_TEMPLATE_APPLY, properties);
+    }
+
     public void end() {
         // don't try to send an "end" event if the session wasn't started in the first place
         if (mStarted) {
@@ -139,6 +154,10 @@ private Map<String, Object> getCommonProperties() {
         properties.put(KEY_HAS_UNSUPPORTED_BLOCKS, mHasUnsupportedBlocks ? "1" : "0");
         properties.put(AnalyticsUtils.EDITOR_HAS_HW_ACCELERATION_DISABLED_KEY, mHWAccOff ? "1" : "0");
 
+        if (mTemplate != null) {
+            properties.put(KEY_TEMPLATE, mTemplate);
+        }
+
         return properties;
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java
@@ -433,8 +433,11 @@ public static String replaceMediaFileWithUrlInGutenbergPost(@NonNull String post
     public static boolean isMediaInGutenbergPostBody(@NonNull String postContent,
                                             String localMediaId) {
         // check if media is in Gutenberg Post
-        String imgBlockHeaderToSearchFor = String.format("<!-- wp:image {\"id\":%s} -->", localMediaId);
-        return postContent.indexOf(imgBlockHeaderToSearchFor) != -1;
+        String imgBlockHeaderToSearchFor =
+                String.format("<!-- wp:image \\{[^\\}]*\"id\":%s[^\\}]*\\} -->", localMediaId);
+        Pattern pattern = Pattern.compile(imgBlockHeaderToSearchFor);
+        Matcher matcher = pattern.matcher(postContent);
+        return matcher.find();
     }
 
     public static boolean isPostInConflictWithRemote(PostImmutableModel post) {

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -1893,6 +1893,8 @@ private void removeNonSelfHostedPreferences() {
         WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_site_advanced);
         WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_site_quota);
         WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_jetpack_settings);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen,
+                R.string.pref_key_jetpack_performance_settings);
     }
 
     private void removeNonJetpackPreferences() {
@@ -1943,6 +1945,8 @@ private void removeNonWPComPreferences() {
         WPPrefUtils.removePreference(this, R.string.pref_key_site_screen, R.string.pref_key_jetpack_settings);
         WPPrefUtils.removePreference(this, R.string.pref_key_site_screen,
                 R.string.pref_key_jetpack_performance_media_settings);
+        WPPrefUtils.removePreference(this, R.string.pref_key_site_screen,
+                R.string.pref_key_jetpack_performance_settings);
     }
 
     private Preference getChangePref(int id) {

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/BlockDiffCallback.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/BlockDiffCallback.kt
@@ -24,7 +24,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.IMAGE_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.INFO
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK_BUTTON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM_WITH_ICON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LOADING_ITEM
@@ -72,7 +71,6 @@ class BlockDiffCallback(
                 CHART_LEGEND,
                 REFERRED_ITEM,
                 QUICK_SCAN_ITEM,
-                LINK_BUTTON,
                 DIALOG_BUTTONS,
                 TAG_ITEM,
                 IMAGE_ITEM,

diff --git a/...s/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListAdapter.kt b/...s/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/BlockListAdapter.kt
@@ -18,7 +18,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Heade
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ImageItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Information
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Link
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LinkButton
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.ListItemWithIcon
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.LoadingItem
@@ -43,7 +42,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.IMAGE_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.INFO
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK
-import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LINK_BUTTON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LIST_ITEM_WITH_ICON
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Type.LOADING_ITEM
@@ -71,7 +69,6 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.FourCol
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.HeaderViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.ImageItemViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.InformationViewHolder
-import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.LinkButtonViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.LinkViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.ListItemViewHolder
 import org.wordpress.android.ui.stats.refresh.lists.sections.viewholders.ListItemWithIconViewHolder
@@ -126,7 +123,6 @@ class BlockListAdapter(val imageManager: ImageManager) : Adapter<BlockListItemVi
             ACTIVITY_ITEM -> ActivityViewHolder(parent)
             REFERRED_ITEM -> ReferredItemViewHolder(parent)
             QUICK_SCAN_ITEM -> QuickScanItemViewHolder(parent)
-            LINK_BUTTON -> LinkButtonViewHolder(parent)
             DIALOG_BUTTONS -> DialogButtonsViewHolder(parent)
         }
     }
@@ -166,7 +162,6 @@ class BlockListAdapter(val imageManager: ImageManager) : Adapter<BlockListItemVi
             is LoadingItemViewHolder -> holder.bind(item as LoadingItem)
             is ReferredItemViewHolder -> holder.bind(item as ReferredItem)
             is QuickScanItemViewHolder -> holder.bind(item as QuickScanItem)
-            is LinkButtonViewHolder -> holder.bind(item as LinkButton)
             is DialogButtonsViewHolder -> holder.bind(item as DialogButtons)
         }
     }
-Original file line number
+Diff line change
@@ -1,5 +1,9 @@
+.5
+    -----
 .4
     -----
+    * Fix an issue where image is sometimes uploaded with a path to local storage
 .3
     -----
@@ Expand Down @@