Merge branch 'develop' into gb/contain-and-retain-gb

RELEASE-NOTES.txt

@@ -1,3 +1,4 @@
+* Fixed a bug causing disappearance of old saved posts
 * Add Importing from Giphy in Editor and Media Library
 * Add support for .blog subdomains on new sites.
 * First version of the refreshed stats project - all tabs and all the blocks are completely rewritten in new design

WordPress/build.gradle

@@ -43,8 +43,8 @@ android {
 
     defaultConfig {
         applicationId "org.wordpress.android"
-        versionName "alpha-148"
-        versionCode 669
+        versionName "alpha-149"
+        versionCode 671
         minSdkVersion 21
         targetSdkVersion 26
 

WordPress/metadata/PlayStoreStrings.po

@@ -17,7 +17,7 @@ msgid ""
 "* The Notifications list layout is more readable, as is the Me tab on tablets and large devices.\n"
 "* New privacy settings let you remove of geolocation from uploaded images.\n"
 "* Better messaging when there is no data to show in the stats screen adds clarity.\n"
-"* There was an issue where only admins of self-hosted sites could update their password. Now all users can.\n"
+"* There was an issue where some users of self-hosted sites couldn’t update their password. Now all users can.\n"
 msgstr ""
 
 msgctxt "release_note_115"

WordPress/metadata/release_notes.txt

@@ -2,4 +2,4 @@
 * The Notifications list layout is more readable, as is the Me tab on tablets and large devices.
 * New privacy settings let you remove of geolocation from uploaded images.
 * Better messaging when there is no data to show in the stats screen adds clarity.
-* There was an issue where only admins of self-hosted sites could update their password. Now all users can.
+* There was an issue where some users of self-hosted sites couldn’t update their password. Now all users can.

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

@@ -591,11 +591,13 @@ public static String getDefaultUserAgent() {
         if (mDefaultUserAgent == null) {
             try {
                 mDefaultUserAgent = WebSettings.getDefaultUserAgent(getContext());
-            } catch (AndroidRuntimeException | NullPointerException e) {
+            } catch (AndroidRuntimeException | NullPointerException | IllegalArgumentException e) {
                 // Catch AndroidRuntimeException that could be raised by the WebView() constructor.
                 // See https://github.com/wordpress-mobile/WordPress-Android/issues/3594
                 // Catch NullPointerException that could be raised by WebSettings.getDefaultUserAgent()
                 // See https://github.com/wordpress-mobile/WordPress-Android/issues/3838
+                // Catch IllegalArgumentException that could be raised by WebSettings.getDefaultUserAgent()
+                // See https://github.com/wordpress-mobile/WordPress-Android/issues/9015
 
                 // init with the empty string, it's a rare issue
                 mDefaultUserAgent = "";

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

@@ -243,10 +243,11 @@ private static int purgePostsForTag(SQLiteDatabase db, ReaderTag tag) {
         if (numPosts <= MAX_POSTS_PER_TAG) {
             return 0;
         }
-
-        String[] args = {tag.getTagSlug(), Integer.toString(tag.tagType.toInt()), Integer.toString(MAX_POSTS_PER_TAG)};
-        String where = "pseudo_id NOT IN (SELECT DISTINCT pseudo_id FROM tbl_posts WHERE tag_name=? AND "
-                       + "tag_type=? ORDER BY " + getSortColumnForTag(tag) + " DESC LIMIT ?)";
+        String tagName = tag.getTagSlug();
+        String tagType = Integer.toString(tag.tagType.toInt());
+        String[] args = {tagName, tagType, tagName, tagType, Integer.toString(MAX_POSTS_PER_TAG)};
+        String where = "tag_name=? AND tag_type=? AND pseudo_id NOT IN (SELECT DISTINCT pseudo_id FROM tbl_posts WHERE "
+                       + "tag_name=? AND tag_type=? ORDER BY " + getSortColumnForTag(tag) + " DESC LIMIT ?)";
         int numDeleted = db.delete("tbl_posts", where, args);
         AppLog.d(AppLog.T.READER,
                 String.format(Locale.ENGLISH, "reader post table > purged %d posts in tag %s", numDeleted,

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/StatsListFragment.kt

@@ -54,15 +54,18 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.granular.MonthsList
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.WeeksListViewModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.YearsListViewModel
 import org.wordpress.android.ui.stats.refresh.lists.sections.insights.InsightsListViewModel
+import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.util.Event
 import org.wordpress.android.util.ToastUtils
 import org.wordpress.android.util.image.ImageManager
 import org.wordpress.android.util.observeEvent
+import java.util.Date
 import javax.inject.Inject
 
 class StatsListFragment : DaggerFragment() {
     @Inject lateinit var viewModelFactory: ViewModelProvider.Factory
     @Inject lateinit var imageManager: ImageManager
+    @Inject lateinit var statsDateFormatter: StatsDateFormatter
     private lateinit var viewModel: StatsListViewModel
 
     private var layoutManager: LayoutManager? = null
@@ -186,7 +189,7 @@ class StatsListFragment : DaggerFragment() {
                 is ViewPostDetailStats -> {
                     val postModel = StatsPostModel(
                             site.siteId,
-                            it.postId.toString(),
+                            it.postId,
                             it.postTitle,
                             it.postUrl,
                             it.postType
@@ -213,55 +216,55 @@ class StatsListFragment : DaggerFragment() {
                             activity,
                             site,
                             it.statsGranularity.toStatsTimeFrame(),
-                            it.selectedDate
+                            statsDateFormatter.printStatsDate(it.selectedDate)
                     )
                 }
                 is ViewReferrers -> {
                     ActivityLauncher.viewReferrersStats(
                             activity,
                             site,
                             it.statsGranularity.toStatsTimeFrame(),
-                            it.selectedDate
+                            statsDateFormatter.printStatsDate(it.selectedDate)
                     )
                 }
                 is ViewClicks -> {
                     ActivityLauncher.viewClicksStats(
                             activity,
                             site,
                             it.statsGranularity.toStatsTimeFrame(),
-                            it.selectedDate
+                            statsDateFormatter.printStatsDate(it.selectedDate)
                     )
                 }
                 is ViewCountries -> {
                     ActivityLauncher.viewCountriesStats(
                             activity,
                             site,
                             it.statsGranularity.toStatsTimeFrame(),
-                            it.selectedDate
+                            statsDateFormatter.printStatsDate(it.selectedDate)
                     )
                 }
                 is ViewVideoPlays -> {
                     ActivityLauncher.viewVideoPlays(
                             activity,
                             site,
                             it.statsGranularity.toStatsTimeFrame(),
-                            it.selectedDate
+                            statsDateFormatter.printStatsDate(it.selectedDate)
                     )
                 }
                 is ViewSearchTerms -> {
                     ActivityLauncher.viewSearchTerms(
                             activity,
                             site,
                             it.statsGranularity.toStatsTimeFrame(),
-                            it.selectedDate
+                            statsDateFormatter.printStatsDate(it.selectedDate)
                     )
                 }
                 is ViewAuthors -> {
                     ActivityLauncher.viewAuthorsStats(
                             activity,
                             site,
                             it.statsGranularity.toStatsTimeFrame(),
-                            it.selectedDate
+                            statsDateFormatter.printStatsDate(it.selectedDate)
                     )
                 }
                 is ViewUrl -> {
@@ -294,9 +297,9 @@ sealed class NavigationTarget : Event() {
 
     data class SharePost(val url: String, val title: String) : NavigationTarget()
     data class ViewPostDetailStats(
-        val postId: Long,
+        val postId: String,
         val postTitle: String,
-        val postUrl: String,
+        val postUrl: String?,
         val postType: String = StatsConstants.ITEM_TYPE_POST
     ) : NavigationTarget()
 
@@ -305,13 +308,13 @@ sealed class NavigationTarget : Event() {
     class ViewTagsAndCategoriesStats : NavigationTarget()
     class ViewPublicizeStats : NavigationTarget()
     data class ViewTag(val link: String) : NavigationTarget()
-    data class ViewPostsAndPages(val statsGranularity: StatsGranularity, val selectedDate: String) : NavigationTarget()
-    data class ViewReferrers(val statsGranularity: StatsGranularity, val selectedDate: String) : NavigationTarget()
-    data class ViewClicks(val statsGranularity: StatsGranularity, val selectedDate: String) : NavigationTarget()
-    data class ViewCountries(val statsGranularity: StatsGranularity, val selectedDate: String) : NavigationTarget()
-    data class ViewVideoPlays(val statsGranularity: StatsGranularity, val selectedDate: String) : NavigationTarget()
-    data class ViewSearchTerms(val statsGranularity: StatsGranularity, val selectedDate: String) : NavigationTarget()
-    data class ViewAuthors(val statsGranularity: StatsGranularity, val selectedDate: String) : NavigationTarget()
+    data class ViewPostsAndPages(val statsGranularity: StatsGranularity, val selectedDate: Date) : NavigationTarget()
+    data class ViewReferrers(val statsGranularity: StatsGranularity, val selectedDate: Date) : NavigationTarget()
+    data class ViewClicks(val statsGranularity: StatsGranularity, val selectedDate: Date) : NavigationTarget()
+    data class ViewCountries(val statsGranularity: StatsGranularity, val selectedDate: Date) : NavigationTarget()
+    data class ViewVideoPlays(val statsGranularity: StatsGranularity, val selectedDate: Date) : NavigationTarget()
+    data class ViewSearchTerms(val statsGranularity: StatsGranularity, val selectedDate: Date) : NavigationTarget()
+    data class ViewAuthors(val statsGranularity: StatsGranularity, val selectedDate: Date) : NavigationTarget()
     data class ViewUrl(val url: String) : NavigationTarget()
 }
 

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/AuthorsUseCase.kt

@@ -10,8 +10,9 @@ import org.wordpress.android.fluxc.network.utils.StatsGranularity
 import org.wordpress.android.fluxc.store.StatsStore.TimeStatsTypes.AUTHORS
 import org.wordpress.android.fluxc.store.stats.time.AuthorsStore
 import org.wordpress.android.modules.UI_THREAD
+import org.wordpress.android.ui.stats.StatsConstants
 import org.wordpress.android.ui.stats.refresh.lists.NavigationTarget.ViewAuthors
-import org.wordpress.android.ui.stats.refresh.lists.NavigationTarget.ViewUrl
+import org.wordpress.android.ui.stats.refresh.lists.NavigationTarget.ViewPostDetailStats
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Divider
 import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Empty
@@ -26,11 +27,10 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularSt
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDateProvider
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.UseCaseFactory
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.AuthorsUseCase.SelectedAuthor
-import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.ui.stats.refresh.utils.toFormattedString
-import java.util.Date
 import org.wordpress.android.ui.stats.refresh.utils.trackGranular
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import java.util.Date
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -42,7 +42,6 @@ constructor(
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val authorsStore: AuthorsStore,
     selectedDateProvider: SelectedDateProvider,
-    private val statsDateFormatter: StatsDateFormatter,
     private val analyticsTracker: AnalyticsTrackerWrapper
 ) : GranularStatefulUseCase<AuthorsModel, SelectedAuthor>(
         AUTHORS,
@@ -110,7 +109,10 @@ constructor(
                                     text = post.title,
                                     value = post.views.toFormattedString(),
                                     showDivider = false,
-                                    navigationAction = post.url?.let { create(it, this::onPostClicked) }
+                                    navigationAction = create(
+                                            PostClickParams(post.id, post.url, post.title),
+                                            this::onPostClicked
+                                    )
                             )
                         })
                         items.add(Divider)
@@ -132,22 +134,34 @@ constructor(
 
     private fun onViewMoreClicked(statsGranularity: StatsGranularity) {
         analyticsTracker.trackGranular(AnalyticsTracker.Stat.STATS_AUTHORS_VIEW_MORE_TAPPED, statsGranularity)
-        navigateTo(ViewAuthors(statsGranularity, statsDateFormatter.todaysDateInStatsFormat()))
+        navigateTo(ViewAuthors(statsGranularity, selectedDateProvider.getSelectedDate(statsGranularity) ?: Date()))
     }
 
-    private fun onPostClicked(url: String) {
+    private fun onPostClicked(params: PostClickParams) {
         analyticsTracker.trackGranular(AnalyticsTracker.Stat.STATS_AUTHORS_VIEW_POST_TAPPED, statsGranularity)
-        navigateTo(ViewUrl(url))
+        navigateTo(
+                ViewPostDetailStats(
+                        postId = params.postId,
+                        postTitle = params.postTitle,
+                        postUrl = params.postUrl,
+                        postType = StatsConstants.ITEM_TYPE_POST
+                )
+        )
     }
 
     data class SelectedAuthor(val author: AuthorsModel.Author? = null)
 
+    private data class PostClickParams(
+        val postId: String,
+        val postUrl: String?,
+        val postTitle: String
+    )
+
     class AuthorsUseCaseFactory
     @Inject constructor(
         @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
         private val authorsStore: AuthorsStore,
         private val selectedDateProvider: SelectedDateProvider,
-        private val statsDateFormatter: StatsDateFormatter,
         private val analyticsTracker: AnalyticsTrackerWrapper
     ) : UseCaseFactory {
         override fun build(granularity: StatsGranularity) =
@@ -156,7 +170,6 @@ constructor(
                         mainDispatcher,
                         authorsStore,
                         selectedDateProvider,
-                        statsDateFormatter,
                         analyticsTracker
                 )
     }

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/ClicksUseCase.kt

@@ -26,11 +26,10 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularSt
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDateProvider
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.UseCaseFactory
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.usecases.ClicksUseCase.SelectedClicksGroup
-import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.ui.stats.refresh.utils.toFormattedString
-import java.util.Date
 import org.wordpress.android.ui.stats.refresh.utils.trackGranular
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import java.util.Date
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -42,7 +41,6 @@ constructor(
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val store: ClicksStore,
     selectedDateProvider: SelectedDateProvider,
-    private val statsDateFormatter: StatsDateFormatter,
     private val analyticsTracker: AnalyticsTrackerWrapper
 ) : GranularStatefulUseCase<ClicksModel, SelectedClicksGroup>(
         CLICKS,
@@ -133,7 +131,7 @@ constructor(
 
     private fun onViewMoreClick(statsGranularity: StatsGranularity) {
         analyticsTracker.trackGranular(AnalyticsTracker.Stat.STATS_CLICKS_VIEW_MORE_TAPPED, statsGranularity)
-        navigateTo(ViewClicks(statsGranularity, statsDateFormatter.todaysDateInStatsFormat()))
+        navigateTo(ViewClicks(statsGranularity, selectedDateProvider.getSelectedDate(statsGranularity) ?: Date()))
     }
 
     private fun onItemClick(url: String) {
@@ -148,7 +146,6 @@ constructor(
         @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
         private val store: ClicksStore,
         private val selectedDateProvider: SelectedDateProvider,
-        private val statsDateFormatter: StatsDateFormatter,
         private val analyticsTracker: AnalyticsTrackerWrapper
     ) : UseCaseFactory {
         override fun build(granularity: StatsGranularity) =
@@ -157,7 +154,6 @@ constructor(
                         mainDispatcher,
                         store,
                         selectedDateProvider,
-                        statsDateFormatter,
                         analyticsTracker
                 )
     }

WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/granular/usecases/CountryViewsUseCase.kt

@@ -22,11 +22,10 @@ import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.Title
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.GranularStatelessUseCase
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.SelectedDateProvider
 import org.wordpress.android.ui.stats.refresh.lists.sections.granular.UseCaseFactory
-import org.wordpress.android.ui.stats.refresh.utils.StatsDateFormatter
 import org.wordpress.android.ui.stats.refresh.utils.toFormattedString
-import java.util.Date
 import org.wordpress.android.ui.stats.refresh.utils.trackGranular
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
+import java.util.Date
 import javax.inject.Inject
 import javax.inject.Named
 
@@ -38,7 +37,6 @@ constructor(
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     private val store: CountryViewsStore,
     selectedDateProvider: SelectedDateProvider,
-    private val statsDateFormatter: StatsDateFormatter,
     private val analyticsTracker: AnalyticsTrackerWrapper
 ) : GranularStatelessUseCase<CountryViewsModel>(COUNTRIES, mainDispatcher, selectedDateProvider, statsGranularity) {
     override fun buildLoadingItem(): List<BlockListItem> = listOf(Title(R.string.stats_countries))
@@ -109,15 +107,14 @@ constructor(
 
     private fun onViewMoreClick(statsGranularity: StatsGranularity) {
         analyticsTracker.trackGranular(AnalyticsTracker.Stat.STATS_COUNTRIES_VIEW_MORE_TAPPED, statsGranularity)
-        navigateTo(ViewCountries(statsGranularity, statsDateFormatter.todaysDateInStatsFormat()))
+        navigateTo(ViewCountries(statsGranularity, selectedDateProvider.getSelectedDate(statsGranularity) ?: Date()))
     }
 
     class CountryViewsUseCaseFactory
     @Inject constructor(
         @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
         private val store: CountryViewsStore,
         private val selectedDateProvider: SelectedDateProvider,
-        private val statsDateFormatter: StatsDateFormatter,
         private val analyticsTracker: AnalyticsTrackerWrapper
     ) : UseCaseFactory {
         override fun build(granularity: StatsGranularity) =
@@ -126,7 +123,6 @@ constructor(
                         mainDispatcher,
                         store,
                         selectedDateProvider,
-                        statsDateFormatter,
                         analyticsTracker
                 )
     }