Merge pull request #20945 from wordpress-mobile/feature/convert-blockprocessor-to-kotlin

Convert `BlockProcessor` to kotlin

Author: aditi-bhatia

WordPress/src/main/java/org/wordpress/android/ui/media/services/MediaUploadReadyListener.java

@@ -1,5 +1,6 @@
 package org.wordpress.android.ui.media.services;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import org.wordpress.android.fluxc.model.PostModel;
@@ -14,7 +15,7 @@ public interface MediaUploadReadyListener {
     // TODO: We're passing a SiteModel parameter here in order to debug a crash on SaveStoryGutenbergBlockUseCase.
     //  Once that's done, the parameter should be replaced with a site url String, like it was before.
     //  See: https://git.io/JqfhK
-    PostModel replaceMediaFileWithUrlInPost(@Nullable PostModel post, String localMediaId, MediaFile mediaFile,
+    PostModel replaceMediaFileWithUrlInPost(@Nullable PostModel post, @NonNull String localMediaId, MediaFile mediaFile,
                                             @Nullable SiteModel site);
     PostModel markMediaUploadFailedInPost(@Nullable PostModel post, String localMediaId, MediaFile mediaFile);
 }

WordPress/src/main/java/org/wordpress/android/ui/posts/PostUtils.java

@@ -430,7 +430,8 @@ public static boolean shouldShowGutenbergEditor(boolean isNewPost, String postCo
     }
 
     public static String replaceMediaFileWithUrlInGutenbergPost(@NonNull String postContent,
-                                                 String localMediaId, MediaFile mediaFile, String siteUrl) {
+                                                                @NonNull String localMediaId, MediaFile mediaFile,
+                                                                String siteUrl) {
         if (mediaFile != null && contentContainsGutenbergBlocks(postContent)) {
             MediaUploadCompletionProcessor processor = new MediaUploadCompletionProcessor(localMediaId, mediaFile,
                     siteUrl);

WordPress/src/main/java/org/wordpress/android/ui/posts/mediauploadcompletionprocessors/AudioBlockProcessor.kt

@@ -4,14 +4,14 @@ import com.google.gson.JsonObject
 import org.jsoup.nodes.Document
 import org.wordpress.android.util.helpers.MediaFile
 
-class AudioBlockProcessor(localId: String?, mediaFile: MediaFile?) : BlockProcessor(localId, mediaFile) {
+class AudioBlockProcessor(localId: String, mediaFile: MediaFile) : BlockProcessor(localId, mediaFile) {
     override fun processBlockContentDocument(document: Document?): Boolean {
         val audioElements = document?.select(AUDIO_TAG)
 
         audioElements?.let { elements ->
             for (element in elements) {
                 // replaces the src attribute's local url with the remote counterpart.
-                element.attr(SRC_ATTRIBUTE, mRemoteUrl)
+                element.attr(SRC_ATTRIBUTE, remoteUrl)
             }
             return true
         }
@@ -21,9 +21,9 @@ class AudioBlockProcessor(localId: String?, mediaFile: MediaFile?) : BlockProces
     override fun processBlockJsonAttributes(jsonAttributes: JsonObject?): Boolean {
         val id = jsonAttributes?.get(ID_ATTRIBUTE)
 
-        return if (id != null && !id.isJsonNull && id.asString == mLocalId) {
+        return if (id != null && !id.isJsonNull && id.asString == localId) {
             jsonAttributes.apply {
-                addIntPropertySafely(this, ID_ATTRIBUTE, mRemoteId)
+                addIntPropertySafely(this, ID_ATTRIBUTE, remoteId)
             }
             true
         } else {