wordpress-mobile · loremattei · Dec 16, 2019 · Dec 4, 2019 · Dec 4, 2019 · Dec 4, 2019
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-199"
+            versionName "alpha-200"
         }
-        versionCode 803
+        versionCode 805
         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 "13.8-rc-1"
+                versionName "13.8"
             }
-            versionCode 802
+            versionCode 806
             buildConfigField "boolean", "ME_ACTIVITY_AVAILABLE", "false"
         }
 

diff --git a/WordPress/metadata/PlayStoreStrings.po b/WordPress/metadata/PlayStoreStrings.po
@@ -11,21 +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_137"
+msgctxt "release_note_138"
 msgid ""
-"13.7:\n"
-"* Block editor updates: unsupported blocks now display a title, new-block indicators display both in empty editors and after the last block, adding links pulls from existing URLs in your clipboard, Media and Text blocks have more alignment options, image blocks are tappable for full-screen preview.\n"
+"13.8:\n"
+"* Block editor improvements: Added Spacer block for creating white space between content.\n"
+"* Modified Blog Post Search to include posts under all categories.\n"
+"* Lots of under-the-hood improvements across the entire app –26 unique crash and bug fixes in all.\n"
 "\n"
-"* General improvements: fixed some bugs and crashes, and added better TalkBack screen reader support in the Reader.\n"
 msgstr ""
 
-msgctxt "release_note_136"
+msgctxt "release_note_137"
 msgid ""
-"13.6:\n"
-"- We updated the navigation bar color to white on Android 8.1 and higher.\n"
-"- Bugs in page list ordering are fixed, so pages always appear in alphabetical order.\n"
-"- Block editor updates: Added support for Pexels images and image alignment options.\n"
+"13.7:\n"
+"* Block editor updates: unsupported blocks now display a title, new-block indicators display both in empty editors and after the last block, adding links pulls from existing URLs in your clipboard, Media and Text blocks have more alignment options, image blocks are tappable for full-screen preview.\n"
 "\n"
+"* General improvements: fixed some bugs and crashes, and added better TalkBack screen reader support in the Reader.\n"
 msgstr ""
 
 #. translators: Release notes for this version to be displayed in the Play Store. Limit to 500 characters including spaces and commas!

diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt
@@ -1,3 +1,4 @@
-* Block editor updates: unsupported blocks now display a title, new-block indicators display both in empty editors and after the last block, adding links pulls from existing URLs in your clipboard, Media and Text blocks have more alignment options, image blocks are tappable for full-screen preview.
+* Block editor improvements: Added Spacer block for creating white space between content.
+* Modified Blog Post Search to include posts under all categories.
+* Lots of under-the-hood improvements across the entire app –26 unique crash and bug fixes in all.
 
-* General improvements: fixed some bugs and crashes, and added better TalkBack screen reader support in the Reader.
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
@@ -354,7 +354,7 @@ private void newPostSetup() {
         }
 
         // Create a new post
-        mEditPostRepository.setInTransaction(() -> {
+        mEditPostRepository.set(() -> {
             PostModel post = mPostStore.instantiatePostModel(mSite, mIsPage, null, null);
             post.setStatus(PostStatus.DRAFT.toString());
             return post;
@@ -442,7 +442,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
                 if (mEditPostRepository.hasPost()) {
                     if (extras.getBoolean(EXTRA_LOAD_AUTO_SAVE_REVISION)) {
-                        mEditPostRepository.updateInTransaction(postModel -> {
+                        mEditPostRepository.update(postModel -> {
                             postModel.setTitle(
                                     TextUtils.isEmpty(postModel.getAutoSaveTitle()) ? postModel
                                             .getTitle()
@@ -608,7 +608,7 @@ private void startObserving() {
     private void initializePostObject() {
         if (mEditPostRepository.hasPost()) {
             mEditPostRepository.saveSnapshot();
-            mEditPostRepository.replaceInTransaction(UploadService::updatePostWithCurrentlyCompletedUploads);
+            mEditPostRepository.replace(UploadService::updatePostWithCurrentlyCompletedUploads);
             if (mShowAztecEditor) {
                 try {
                     mMediaMarkedUploadingOnStartIds = AztecEditorFragment
@@ -683,7 +683,7 @@ private void resetUploadingMediaToFailedIfPostHasNotMediaInProgressOrQueued() {
         if (!useAztec || UploadService.hasPendingOrInProgressMediaUploadsForPost(mEditPostRepository.getPost())) {
             return;
         }
-        mEditPostRepository.updateInTransaction(postModel -> {
+        mEditPostRepository.update(postModel -> {
             String oldContent = postModel.getContent();
             if (!AztecEditorFragment.hasMediaItemsMarkedUploading(EditPostActivity.this, oldContent)
                 // we need to make sure items marked failed are still failed or not as well
@@ -1611,7 +1611,7 @@ private boolean updatePostObject(boolean isAutosave) {
             AppLog.e(AppLog.T.POSTS, "Attempted to save an invalid Post.");
             return false;
         }
-        return mEditPostRepository.updateInTransaction(postModel -> {
+        return mEditPostRepository.update(postModel -> {
             try {
                 boolean postTitleOrContentChanged =
                         updatePostContentNewEditor(postModel, isAutosave, (String) mEditorFragment.getTitle(),
@@ -1821,7 +1821,7 @@ public void onHistoryItemClicked(@NonNull Revision revision, @NonNull List<Revis
     private void loadRevision() {
         updatePostLoadingAndDialogState(PostLoadingState.LOADING_REVISION);
         mEditPostRepository.saveForUndo();
-        mEditPostRepository.updateInTransaction(postModel -> {
+        mEditPostRepository.update(postModel -> {
             postModel.setTitle(Objects.requireNonNull(mRevision.getPostTitle()));
             postModel.setContent(Objects.requireNonNull(mRevision.getPostContent()));
             postModel.setIsLocallyChanged(true);
@@ -1907,7 +1907,7 @@ private class SavePostLocallyAndFinishTask extends AsyncTask<Void, Void, Boolean
         @Override
         protected Boolean doInBackground(Void... params) {
             if (mEditPostRepository.postHasEdits()) {
-                mEditPostRepository.updateInTransaction(postModel -> {
+                mEditPostRepository.update(postModel -> {
                     // Changes have been made - save the post and ask for the post list to refresh
                     // We consider this being "manual save", it will replace some Android "spans" by an html
                     // or a shortcode replacement (for instance for images and galleries)
@@ -2010,7 +2010,7 @@ private void uploadPost(final boolean publishPost) {
         // text 2. better not to call `updatePostObject()` from the UI thread due to weird thread blocking behavior
         // on API 16 (and 21) with the visual editor.
         new Thread(() -> {
-            mEditPostRepository.updateInTransaction(postModel -> {
+            mEditPostRepository.update(postModel -> {
                 boolean isFirstTimePublish = isFirstTimePublish(publishPost);
                 if (publishPost) {
                     // now set status to PUBLISHED - only do this AFTER we have run the isFirstTimePublish() check,
@@ -2382,7 +2382,7 @@ protected void setPostContentFromShareAction() {
         final String text = intent.getStringExtra(Intent.EXTRA_TEXT);
         final String title = intent.getStringExtra(Intent.EXTRA_SUBJECT);
         if (text != null) {
-            mEditPostRepository.updateInTransaction(postModel -> {
+            mEditPostRepository.update(postModel -> {
                 if (title != null) {
                     mEditorFragment.setTitle(title);
                     postModel.setTitle(title);
@@ -2480,7 +2480,7 @@ private boolean isCurrentMediaMarkedUploadingDifferentToOriginal(String newConte
     }
 
     private void setFeaturedImageId(final long mediaId) {
-        mEditPostRepository.updateInTransaction(postModel -> {
+        mEditPostRepository.update(postModel -> {
             postModel.setFeaturedImageId(mediaId);
             postModel.setIsLocallyChanged(true);
             return true;
@@ -3158,7 +3158,7 @@ public void onPostChanged(OnPostChanged event) {
                 AppLog.e(T.POSTS, "REMOTE_AUTO_SAVE_POST failed: " + event.error.type + " - " + event.error.message);
             }
             mEditPostRepository.loadPostByLocalPostId(mEditPostRepository.getId());
-            mEditPostRepository.replaceInTransaction(postModel -> handleRemoteAutoSave(event.isError(), postModel));
+            mEditPostRepository.replace(postModel -> handleRemoteAutoSave(event.isError(), postModel));
         }
     }
 
@@ -3219,13 +3219,13 @@ public void onPostUploaded(OnPostUploaded event) {
                 mUploadUtilsWrapper.onPostUploadedSnackbarHandler(this, snackbarAttachView, event.isError(), post,
                         event.isError() ? event.error.message : null, getSite());
                 if (!event.isError()) {
-                    mEditPostRepository.setInTransaction(() -> {
+                    mEditPostRepository.set(() -> {
                         updateOnSuccessfulUpload();
                         return post;
                     });
                 }
             } else {
-                mEditPostRepository.setInTransaction(() -> handleRemoteAutoSave(event.isError(), post));
+                mEditPostRepository.set(() -> handleRemoteAutoSave(event.isError(), post));
             }
         }
     }

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostPublishSettingsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostPublishSettingsViewModel.kt
@@ -110,7 +110,7 @@ class EditPostPublishSettingsViewModel
     }
 
     fun updatePost(updatedDate: Calendar, postRepository: EditPostRepository?) {
-        postRepository?.updateInTransaction { postModel ->
+        postRepository?.update { postModel ->
             val dateCreated = DateTimeUtils.iso8601FromDate(updatedDate.time)
             postModel.setDateCreated(dateCreated)
             val initialPostStatus = postRepository.status

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostRepository.kt
@@ -10,11 +10,13 @@ import org.wordpress.android.fluxc.model.post.PostStatus.DRAFT
 import org.wordpress.android.fluxc.model.post.PostStatus.fromPost
 import org.wordpress.android.fluxc.store.PostStore
 import org.wordpress.android.ui.uploads.UploadService
+import org.wordpress.android.util.AppLog
+import org.wordpress.android.util.AppLog.T
+import org.wordpress.android.util.CrashLoggingUtils
 import org.wordpress.android.util.DateTimeUtils
 import org.wordpress.android.util.LocaleManagerWrapper
-import java.util.concurrent.locks.ReentrantReadWriteLock
+import java.util.Arrays
 import javax.inject.Inject
-import kotlin.concurrent.write
 
 class EditPostRepository
 @Inject constructor(
@@ -72,18 +74,37 @@ class EditPostRepository
     val dateLocallyChanged: String
         get() = post!!.dateLocallyChanged
 
-    private val lock = ReentrantReadWriteLock()
+    private var locked = false
 
-    fun updateInTransaction(action: (PostModel) -> Boolean) = lock.write {
-        action(post!!)
+    fun update(action: (PostModel) -> Boolean): Boolean {
+        reportTransactionState(true)
+        val result = action(post!!)
+        reportTransactionState(false)
+        return result
     }
 
-    fun replaceInTransaction(action: (PostModel) -> PostModel) = lock.write {
+    fun replace(action: (PostModel) -> PostModel) {
+        reportTransactionState(true)
         this.post = action(post!!)
+        reportTransactionState(false)
     }
 
-    fun setInTransaction(action: () -> PostModel) = lock.write {
+    fun set(action: () -> PostModel) {
+        reportTransactionState(true)
         this.post = action()
+        reportTransactionState(false)
+    }
+
+    @Synchronized
+    private fun reportTransactionState(lock: Boolean) {
+        if (lock && locked) {
+            val message = "EditPostRepository: Transaction is writing on a locked thread ${Arrays.toString(
+                    Thread.currentThread().stackTrace
+            )}"
+            AppLog.e(T.EDITOR, message)
+            CrashLoggingUtils.log(message)
+        }
+        locked = lock
     }
 
     fun hasLocation() = post!!.hasLocation()
@@ -132,7 +153,9 @@ class EditPostRepository
     fun updateStatusFromSnapshot(post: PostModel) {
         // the user has just tapped on "PUBLISH" on an empty post, make sure to set the status back to the
         // original post's status as we could not proceed with the action
+        reportTransactionState(true)
         post.setStatus(postSnapshotWhenEditorOpened?.status ?: DRAFT.toString())
+        reportTransactionState(false)
     }
 
     fun hasStatusChanged(postStatus: String?): Boolean {
@@ -142,21 +165,21 @@ class EditPostRepository
     fun postHasEdits() = postUtils.postHasEdits(postSnapshotWhenEditorOpened, post!!)
 
     fun updateStatus(status: PostStatus) {
-        updateInTransaction {
+        update {
             it.setStatus(status.toString())
             true
         }
     }
 
     fun loadPostByLocalPostId(postId: Int) {
-        lock.write {
-            post = postStore.getPostByLocalPostId(postId)
-        }
+        reportTransactionState(true)
+        post = postStore.getPostByLocalPostId(postId)
+        reportTransactionState(false)
     }
 
     fun loadPostByRemotePostId(remotePostId: Long, site: SiteModel) {
-        lock.write {
-            post = postStore.getPostByRemotePostId(remotePostId, site)
-        }
+        reportTransactionState(true)
+        post = postStore.getPostByRemotePostId(remotePostId, site)
+        reportTransactionState(false)
     }
 }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostSettingsFragment.java
@@ -662,7 +662,7 @@ private void updateSaveButton() {
     private void updateExcerpt(String excerpt) {
         EditPostRepository editPostRepository = getEditPostRepository();
         if (editPostRepository != null) {
-            editPostRepository.updateInTransaction(postModel -> {
+            editPostRepository.update(postModel -> {
                 postModel.setExcerpt(excerpt);
                 mExcerptTextView.setText(excerpt);
                 return true;
@@ -673,7 +673,7 @@ private void updateExcerpt(String excerpt) {
     private void updateSlug(String slug) {
         EditPostRepository editPostRepository = getEditPostRepository();
         if (editPostRepository != null) {
-            editPostRepository.updateInTransaction(postModel -> {
+            editPostRepository.update(postModel -> {
                 postModel.setSlug(slug);
                 mSlugTextView.setText(slug);
                 return true;
@@ -684,7 +684,7 @@ private void updateSlug(String slug) {
     private void updatePassword(String password) {
         EditPostRepository editPostRepository = getEditPostRepository();
         if (editPostRepository != null) {
-            editPostRepository.updateInTransaction(postModel -> {
+            editPostRepository.update(postModel -> {
                 postModel.setPassword(password);
                 mPasswordTextView.setText(password);
                 return true;
@@ -698,7 +698,7 @@ private void updateCategories(List<Long> categoryList) {
         }
         EditPostRepository editPostRepository = getEditPostRepository();
         if (editPostRepository != null) {
-            editPostRepository.updateInTransaction(postModel -> {
+            editPostRepository.update(postModel -> {
                 postModel.setCategoryIdList(categoryList);
                 updateCategoriesTextView();
                 return true;
@@ -709,7 +709,7 @@ private void updateCategories(List<Long> categoryList) {
     public void updatePostStatus(PostStatus postStatus) {
         EditPostRepository editPostRepository = getEditPostRepository();
         if (editPostRepository != null) {
-            editPostRepository.updateInTransaction(postModel -> {
+            editPostRepository.update(postModel -> {
                 postModel.setStatus(postStatus.toString());
                 updatePostStatusRelatedViews();
                 updateSaveButton();
@@ -721,7 +721,7 @@ public void updatePostStatus(PostStatus postStatus) {
     private void updatePostFormat(String postFormat) {
         EditPostRepository editPostRepository = getEditPostRepository();
         if (editPostRepository != null) {
-            editPostRepository.updateInTransaction(postModel -> {
+            editPostRepository.update(postModel -> {
                 postModel.setPostFormat(postFormat);
                 updatePostFormatTextView();
                 return true;
@@ -751,7 +751,7 @@ private void updateTags(String selectedTags) {
         if (postRepository == null) {
             return;
         }
-        postRepository.updateInTransaction(postModel -> {
+        postRepository.update(postModel -> {
             if (!TextUtils.isEmpty(selectedTags)) {
                 String tags = selectedTags.replace("\n", " ");
                 postModel.setTagNameList(Arrays.asList(TextUtils.split(tags, ",")));
@@ -902,7 +902,7 @@ public void updateFeaturedImage(long featuredImageId) {
         if (postRepository == null) {
             return;
         }
-        postRepository.updateInTransaction(postModel -> {
+        postRepository.update(postModel -> {
             postModel.setFeaturedImageId(featuredImageId);
             updateFeaturedImageView();
             return true;
@@ -1069,7 +1069,7 @@ private void setLocation(@Nullable Place place) {
         if (postRepository == null) {
             return;
         }
-        postRepository.updateInTransaction(postModel -> {
+        postRepository.update(postModel -> {
             if (place == null) {
                 postModel.clearLocation();
                 mLocationTextView.setText("");

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java
@@ -392,7 +392,7 @@ public void onCreate(Bundle savedInstanceState) {
                                        .get(ReaderPostListViewModel.class);
 
         if (BuildConfig.INFORMATION_ARCHITECTURE_AVAILABLE && mIsTopLevel) {
-            mViewModel.getCurrentSubFilter().observe(getActivity(), subfilterListItem -> {
+            mViewModel.getCurrentSubFilter().observe(this, subfilterListItem -> {
                 if (ReaderUtils.isFollowing(
                         mCurrentTag,
                         BuildConfig.INFORMATION_ARCHITECTURE_AVAILABLE && mIsTopLevel,
@@ -402,11 +402,11 @@ public void onCreate(Bundle savedInstanceState) {
                 }
             });
 
-            mViewModel.getShouldShowSubFilters().observe(getActivity(), show -> {
+            mViewModel.getShouldShowSubFilters().observe(this, show -> {
                 mSubFilterComponent.setVisibility(show ? View.VISIBLE : View.GONE);
             });
 
-            mViewModel.getReaderModeInfo().observe(getActivity(), readerModeInfo -> {
+            mViewModel.getReaderModeInfo().observe(this, readerModeInfo -> {
                 if (readerModeInfo != null) {
                     changeReaderMode(readerModeInfo, true);
 
@@ -421,7 +421,7 @@ public void onCreate(Bundle savedInstanceState) {
                 }
             });
 
-            mViewModel.isBottomSheetShowing().observe(getActivity(), event -> {
+            mViewModel.isBottomSheetShowing().observe(this, event -> {
                 event.applyIfNotHandled(isShowing -> {
                     FragmentManager fm = getFragmentManager();
                     if (fm != null) {