Merge 14.1 final into master

WordPress/build.gradle

@@ -55,9 +55,9 @@ android {
         if (project.hasProperty("versionName")) {
             versionName project.property("versionName")
         } else {
-            versionName "alpha-206"
+            versionName "alpha-207"
         }
-        versionCode 823
+        versionCode 825
         minSdkVersion 21
         targetSdkVersion 28
 
@@ -84,9 +84,9 @@ android {
             dimension "buildType"
             // Only set the release version if one isn't provided
             if (!project.hasProperty("versionName")) {
-                versionName "14.1-rc-1"
+                versionName "14.1"
             }
-            versionCode 822
+            versionCode 826
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
         }
 

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

@@ -128,15 +128,31 @@ public static void showPhotoPickerForResult(Activity activity,
                                                 @NonNull MediaBrowserType browserType,
                                                 @Nullable SiteModel site,
                                                 @Nullable Integer localPostId) {
-        Intent intent = new Intent(activity, PhotoPickerActivity.class);
+        Intent intent = createShowPhotoPickerIntent(activity, browserType, site, localPostId);
+        activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER);
+    }
+
+    public static void showPhotoPickerForResult(Fragment fragment,
+                                                @NonNull MediaBrowserType browserType,
+                                                @Nullable SiteModel site,
+                                                @Nullable Integer localPostId) {
+        Intent intent = createShowPhotoPickerIntent(fragment.getContext(), browserType, site, localPostId);
+        fragment.startActivityForResult(intent, RequestCodes.PHOTO_PICKER);
+    }
+
+    private static Intent createShowPhotoPickerIntent(Context context,
+                                                      @NonNull MediaBrowserType browserType,
+                                                      @Nullable SiteModel site,
+                                                      @Nullable Integer localPostId) {
+        Intent intent = new Intent(context, PhotoPickerActivity.class);
         intent.putExtra(PhotoPickerFragment.ARG_BROWSER_TYPE, browserType);
         if (site != null) {
             intent.putExtra(WordPress.SITE, site);
         }
         if (localPostId != null) {
             intent.putExtra(PhotoPickerActivity.LOCAL_POST_ID, localPostId.intValue());
         }
-        activity.startActivityForResult(intent, RequestCodes.PHOTO_PICKER);
+        return intent;
     }
 
     public static void showStockMediaPickerForResult(Activity activity,

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

@@ -446,7 +446,7 @@ public void doNext(Uri uri) {
     }
 
     private void showPhotoPickerForGravatar() {
-        ActivityLauncher.showPhotoPickerForResult(getActivity(), MediaBrowserType.GRAVATAR_IMAGE_PICKER, null, null);
+        ActivityLauncher.showPhotoPickerForResult(this, MediaBrowserType.GRAVATAR_IMAGE_PICKER, null, null);
     }
 
     private void startCropActivity(Uri uri) {

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

@@ -947,7 +947,7 @@ public void onClick(View v) {
                 break;
             case RequestCodes.PHOTO_PICKER:
                 Fragment fragment = mBottomNav.getActiveFragment();
-                if (fragment instanceof MeFragment || fragment instanceof MySiteFragment) {
+                if (fragment instanceof MySiteFragment) {
                     fragment.onActivityResult(requestCode, resultCode, data);
                 }
                 break;

WordPress/src/main/java/org/wordpress/android/ui/reader/utils/ReaderUtils.java

@@ -359,33 +359,32 @@ public static boolean isFollowing(
         }
     }
 
-    public static ReaderTag getValidTagForSharedPrefs(
-            ReaderTag tag,
+    public static @NonNull ReaderTag getValidTagForSharedPrefs(
+            @NonNull ReaderTag tag,
             boolean isTopLevelReader,
             FilteredRecyclerView recyclerView
     ) {
-        ReaderTag validTag = tag;
+        if (!isTopLevelReader) {
+            return tag;
+        }
 
-        if (isTopLevelReader) {
-            if (tag.isDiscover() || tag.isPostsILike() || tag.isBookmarked()
-                    ||
-                (recyclerView != null && recyclerView.isValidFilter(tag))
-            ) {
-                validTag = tag;
+        boolean isValidFilter = (recyclerView != null && recyclerView.isValidFilter(tag));
+        boolean isSpecialTag = tag.isDiscover() || tag.isPostsILike() || tag.isBookmarked();
+        if (!isSpecialTag && !isValidFilter && isFollowing(tag, isTopLevelReader, recyclerView)) {
+            ReaderTag defaultTag = ReaderUtils.getDefaultTag();
+            // it's possible the default tag won't exist if the user just changed the app's
+            // language, in which case default to the first tag in the table
+            if (ReaderTagTable.tagExists(defaultTag)) {
+                return defaultTag;
             } else {
-                if (isFollowing(tag, isTopLevelReader, recyclerView)) {
-                    validTag = ReaderUtils.getDefaultTag();
-
-                    // it's possible the default tag won't exist if the user just changed the app's
-                    // language, in which case default to the first tag in the table
-                    if (!ReaderTagTable.tagExists(validTag)) {
-                        validTag = ReaderTagTable.getFirstTag();
-                    }
+                ReaderTag firstTag = ReaderTagTable.getFirstTag();
+                if (firstTag != null) {
+                    return firstTag;
                 }
             }
         }
 
-        return validTag;
+        return tag;
     }
 
     public static boolean isDefaultTag(ReaderTag tag) {

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

@@ -27,7 +27,7 @@ public class SiteUtils {
     public static final String GB_EDITOR_NAME = "gutenberg";
     public static final String AZTEC_EDITOR_NAME = "aztec";
     private static final int GB_ROLLOUT_PERCENTAGE_PHASE_1 = 100;
-    private static final int GB_ROLLOUT_PERCENTAGE_PHASE_2 = 30;
+    private static final int GB_ROLLOUT_PERCENTAGE_PHASE_2 = 100;
 
     /**
      * Migrate the old app-wide editor preference value to per-site setting. wpcom sites will make a network call

WordPress/src/main/res/values-ar/strings.xml

@@ -1,11 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Translation-Revision-Date: 2020-01-24 00:54:10+0000
+Translation-Revision-Date: 2020-02-10 20:12:35+0000
 Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;
 Generator: GlotPress/2.4.0-alpha
 Language: ar
 -->
 <resources>
+    <string name="gutenberg_native_video_caption_s">تسمية الفيديو. %s</string>
+    <string name="gutenberg_native_edit_video">تحرير الفيديو</string>
+    <string name="gutenberg_native_edit_media">تحرير الوسائط</string>
+    <string name="gutenberg_native_double_tap_to_select_layout">انقر نقرًا مزدوجًا لتحديد المخطط</string>
+    <string name="gutenberg_native_add_a_shortcode">إضافة كود قصير…</string>
+    <string name="post_list_author">نشر الكاتب</string>
+    <string name="fab_create_desc">إنشاء مقالة</string>
+    <string name="stats_posting_activity_end_description">لقد استمعت إلى جميع الإحصاءت لهذه الفترة.\n بالنقر مرة أخرى سيجرى إعادة التشغيل من البداية.</string>
+    <string name="stats_posting_activity_empty_description">لا توجد إحصاءات في هذه الفترة.</string>
+    <string name="stats_posting_activity_label_content_description">نشر النشاط لـ %1$s</string>
+    <string name="stats_posting_activity_content_description">تتمثل الأيام ذات %1$s من المشاهدات لـ %2$s في: %2$s %3$s.انقر لمعرفة المزيد.</string>
+    <string name="stats_posting_activity_action">تصفح جميع الإحصاءات لهذه الفترة</string>
+    <string name="stats_box_type_very_high">مرتفع جدًا</string>
+    <string name="stats_box_type_high">مرتفع</string>
+    <string name="stats_box_type_medium">متوسط</string>
+    <string name="stats_box_type_low">منخفض</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
+    <string name="stats_bar_chart_accessibility_entry">%1$s، %2$d %3$s</string>
     <string name="gutenberg_native_remove_image">إزالة الصورة</string>
     <string name="gutenberg_native_move_image_forward">تحريك الصورة إلى الأمام</string>
     <string name="gutenberg_native_move_image_backward">تحريك الصورة إلى الخلف</string>
@@ -169,14 +187,12 @@ Language: ar
     <string name="stats_post_views_label">المشاهدات</string>
     <string name="stats_post_label">المقالة</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
-    <string name="stats_posting_activity_graph">الرسم البياني لنشاط النشر.</string>
     <string name="stats_item_collapsed">تم طيّ العنصر</string>
     <string name="stats_item_expanded">تمّ توسيع العنصر</string>
     <string name="stats_collapse_content_description">طيّ</string>
     <string name="stats_expand_content_description">توسيع</string>
     <string name="stats_graph_updated">تمّ تحديث الرسم البياني.</string>
     <string name="stats_overview_content_description">%1$s %2$s للفترة: %3$s، التغييرات من الفترة السابقة - %4$s</string>
-    <string name="stats_bar_chart_content_description">رسم بياني لمشاهدات الموقع.</string>
     <string name="stats_loading_card">تحميل بيانات البطاقة المُحدَّدة</string>
     <string name="site_settings_editor">المُحرر</string>
     <string name="description_expand">توسيع</string>
@@ -649,7 +665,6 @@ Language: ar
     <string name="featured_image_desc">صورة مميزة</string>
     <string name="button_discard">تجاهل</string>
     <string name="reader_avatar_desc">صورة ملف التعريف</string>
-    <string name="reader_blavatar_desc">أيقونة الموقع</string>
     <string name="notification_channel_transient_title">عابر</string>
     <string name="support_identity_input_dialog_email_label">البريد الإلكتروني</string>
     <string name="support_identity_input_dialog_enter_email">يرجى إدخال عنوان بريدك الإلكتروني</string>
@@ -765,7 +780,6 @@ Language: ar
     <string name="site_settings_quota_space_unlimited">%1$s من غير المحدود</string>
     <string name="preview_count">معاينة %d</string>
     <string name="add_count">إضافة %d</string>
-    <string name="fab_create_desc">إنشاء</string>
     <string name="fab_add_tag_desc">إنشاء وسم</string>
     <string name="navigate_up_desc">الانتقال إلى أعلى</string>
     <string name="notification_settings_switch_desc">التنبيهات</string>
@@ -1147,7 +1161,7 @@ Language: ar
     <string name="login_site_address_help_content">يظهر عنوان موقعك في الشريط الموجود في أعلى الشاشة عندما تدخل إلى موقعك من متصفح Chrome.</string>
     <string name="login_site_address_help_title">ما عنوان الموقع الخاص بي؟</string>
     <string name="login_site_address_help">هل تحتاج إلى المساعدة في العثور على عنوان موقعك؟</string>
-    <string name="login_site_address">عنوان الموقع</string>
+    <string name="login_site_address">رابط الموقع</string>
     <string name="enter_site_address">أدخل العنوان لموقع ووردبريس الذي تود الاتصال به.</string>
     <string name="login_username_at">\@%s</string>
     <string name="login_already_logged_in_wpcom">تم تسجيل الدخول بالفعل إلى WordPress.com</string>

WordPress/src/main/res/values-cs/strings.xml

@@ -257,7 +257,6 @@ Language: cs_CZ
     <string name="featured_image_desc">náhledový obrázek</string>
     <string name="button_discard">Zahodit</string>
     <string name="reader_avatar_desc">profilový obrázek</string>
-    <string name="reader_blavatar_desc">ikona stránky</string>
     <string name="notification_channel_transient_title">Přechodný</string>
     <string name="support_identity_input_dialog_email_label">Email</string>
     <string name="support_identity_input_dialog_enter_email">Zadejte emailovou adresu</string>
@@ -374,7 +373,6 @@ Language: cs_CZ
     <string name="site_settings_quota_space_unlimited">%1$s z neomezeného množství</string>
     <string name="preview_count">Náhled %d</string>
     <string name="add_count">Přidat %d</string>
-    <string name="fab_create_desc">vytvořit</string>
     <string name="fab_add_tag_desc">vytvořit štítek</string>
     <string name="navigate_up_desc">přejít nahoru</string>
     <string name="notification_settings_switch_desc">Upozornění</string>

WordPress/src/main/res/values-de/strings.xml

@@ -1,11 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Translation-Revision-Date: 2020-01-19 10:22:41+0000
+Translation-Revision-Date: 2020-02-06 00:54:09+0000
 Plural-Forms: nplurals=2; plural=n != 1;
 Generator: GlotPress/2.4.0-alpha
 Language: de
 -->
 <resources>
+    <string name="gutenberg_native_video_caption_s">Videountertitel. %s</string>
+    <string name="gutenberg_native_edit_video">Video bearbeiten</string>
+    <string name="gutenberg_native_edit_media">Medien bearbeiten</string>
+    <string name="gutenberg_native_double_tap_to_select_layout">Zum Auswählen des Layouts zweimal tippen</string>
+    <string name="gutenberg_native_add_a_shortcode">Füge einen Shortcode hinzu…</string>
+    <string name="post_list_author">Beitragsautor</string>
+    <string name="fab_create_desc">Einen Beitrag erstellen</string>
+    <string name="stats_posting_activity_end_description">Du kennst nun alle Statistiken für diesen Zeitraum.\n Tippe erneut, um von vorne zu beginnen.</string>
+    <string name="stats_posting_activity_empty_description">Es gibt keine Statistiken für diesen Zeitraum.</string>
+    <string name="stats_posting_activity_label_content_description">Beitragsaktivität für %1$s</string>
+    <string name="stats_posting_activity_content_description">Tage mit %1$s Aufrufen von %2$s: %2$s %3$s.Tippe für weitere Informationen.</string>
+    <string name="stats_posting_activity_action">Navigiere zu allen Statistiken für diesen Zeitraum</string>
+    <string name="stats_box_type_very_high">sehr hoch</string>
+    <string name="stats_box_type_high">hoch</string>
+    <string name="stats_box_type_medium">mittel</string>
+    <string name="stats_box_type_low">niedrig</string>
+    <string name="stats_bar_chart_accessibility_overlapping_entry">  &amp; %1$d %2$s</string>
+    <string name="stats_bar_chart_accessibility_entry">%1$s, %2$d %3$s</string>
     <string name="gutenberg_native_remove_image">Bild entfernen</string>
     <string name="gutenberg_native_move_image_forward">Bild nach vorne verschieben</string>
     <string name="gutenberg_native_move_image_backward">Bild nach hinten verschieben</string>
@@ -75,8 +93,6 @@ Language: de
     <string name="gutenberg_native_s_isn_t_yet_supported_on_wordpress_for_android">\'%s\' wird in WordPress für Android noch nicht unterstützt</string>
     <string name="gutenberg_native_s_block_this_block_has_invalid_content">Block %s. Dieser Block hat ungültigen Inhalt</string>
     <string name="gutenberg_native_s_block_empty">Block %s. Leer</string>
-    <string name="gutenberg_native_s_block">Block %s</string>
-    <string name="gutenberg_native_row_d">Zeile %d.</string>
     <string name="gutenberg_native_reset_block">Block zurücksetzen</string>
     <string name="gutenberg_native_remove_block_at_row_s">Block in Zeile %s entfernen</string>
     <string name="gutenberg_native_remove_annotations">Anmerkungen entfernen</string>
@@ -99,14 +115,11 @@ Language: de
     <string name="gutenberg_native_move_block_down">Block nach unten verschieben</string>
     <string name="gutenberg_native_link_text">Linktext</string>
     <string name="gutenberg_native_link_inserted">Link eingefügt</string>
-    <string name="gutenberg_native_level_s_empty">Ebene %s. Leer.</string>
-    <string name="gutenberg_native_level_1_s_2_s">Ebene %1$s. %2$s</string>
     <string name="gutenberg_native_image_caption_s">Bildunterschrift. %s</string>
     <string name="gutenberg_native_hide_keyboard">Tastatur ausblenden</string>
     <string name="gutenberg_native_here_is_the_panel_content">Hier ist der Bedienfeldinhalt!</string>
     <string name="gutenberg_native_help_icon">Hilfe-Icon</string>
     <string name="gutenberg_native_failed_to_insert_media_please_tap_for_options">Das Einfügen von Medien ist fehlgeschlagen.\nFür Optionen bitte hier tippen.</string>
-    <string name="gutenberg_native_empty">Leer</string>
     <string name="gutenberg_native_double_tap_to_undo_last_change">Zum Rückgängigmachen der letzten Änderung zweimal tippen</string>
     <string name="gutenberg_native_double_tap_to_toggle_setting">Zum Umschalten der Einstellung zweimal tippen</string>
     <string name="gutenberg_native_double_tap_to_select_an_image">Zum Auswählen eines Bilds zweimal tippen</string>
@@ -248,14 +261,12 @@ Language: de
     <string name="stats_post_views_label">Aufrufe</string>
     <string name="stats_post_label">Beitrag</string>
     <string name="stats_list_item_description">%1$s: %2$s, %3$s: %4$s</string>
-    <string name="stats_posting_activity_graph">Grafik der Beitrags-Aktivität.</string>
     <string name="stats_item_collapsed">Element ist zusammengeklappt</string>
     <string name="stats_item_expanded">Element ist aufgeklappt</string>
     <string name="stats_collapse_content_description">Zuklappen</string>
     <string name="stats_expand_content_description">Aufklappen</string>
     <string name="stats_graph_updated">Diagramm aktualisiert.</string>
     <string name="stats_overview_content_description">%1$s %2$s für die Periode: %3$s, Veränderung gegenüber der Vorperiode - %4$s</string>
-    <string name="stats_bar_chart_content_description">Grafik der Website-Aufrufe.</string>
     <string name="stats_loading_card">Laden der ausgewählten Kartendaten</string>
     <string name="site_settings_editor">Editor</string>
     <string name="description_expand">Erweitern</string>
@@ -728,7 +739,6 @@ Language: de
     <string name="featured_image_desc">Beitragsbild</string>
     <string name="button_discard">Verwerfen</string>
     <string name="reader_avatar_desc">Profilbild</string>
-    <string name="reader_blavatar_desc">Website-Icon</string>
     <string name="notification_channel_transient_title">Transient</string>
     <string name="support_identity_input_dialog_email_label">E-Mail</string>
     <string name="support_identity_input_dialog_enter_email">Bitte gib deine E-Mail-Adresse ein</string>
@@ -845,7 +855,6 @@ Language: de
     <string name="site_settings_quota_space_unlimited">%1$s von unbegrenzt</string>
     <string name="preview_count">%d in der Vorschau anzeigen</string>
     <string name="add_count">%d hinzufügen</string>
-    <string name="fab_create_desc">erstellen</string>
     <string name="fab_add_tag_desc">Schlagwort erstellen</string>
     <string name="navigate_up_desc">nach oben navigieren</string>
     <string name="notification_settings_switch_desc">Benachrichtigungen</string>