Merge remote-tracking branch 'origin/snackbar-for-recent-search-deletions' into snackbar-for-recent-search-deletions

Author: abhishekabhi789

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "ml.docilealligator.infinityforreddit"
         minSdk 21
         targetSdk 33
-        versionCode 162
-        versionName "7.0.2"
+        versionCode 163
+        versionName "7.1.0-beta1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -99,7 +99,7 @@ dependencies {
     implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
     implementation "com.squareup.retrofit2:converter-scalars:$retrofitVersion"
     implementation "com.squareup.retrofit2:adapter-guava:$retrofitVersion"
-    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
 
     // Dependency injection
     def daggerVersion = '2.40.5'
@@ -111,7 +111,7 @@ dependencies {
     def butterknifeVersion = "10.2.3"
     implementation "com.jakewharton:butterknife:$butterknifeVersion"
     annotationProcessor "com.jakewharton:butterknife-compiler:$butterknifeVersion"
-    compileOnly 'com.android.databinding:viewbinding:7.3.1'
+    compileOnly 'com.android.databinding:viewbinding:8.3.1'
 
     // Events
     def eventbusVersion = "3.3.1"
@@ -135,7 +135,7 @@ dependencies {
     implementation 'net.lingala.zip4j:zip4j:2.11.2'
 
     // IO functionality
-    implementation 'commons-io:commons-io:2.5'
+    implementation 'commons-io:commons-io:2.13.0'
 
     // Crash reporting
     implementation 'com.github.FunkyMuse:Crashy:1.2.0'
@@ -144,7 +144,7 @@ dependencies {
 /**** User Interface (frontend) ****/
 
     //Image loading
-    def glideVersion = "4.12.0"
+    def glideVersion = "4.16.0"
     implementation "com.github.bumptech.glide:glide:$glideVersion"
     annotationProcessor "com.github.bumptech.glide:compiler:$glideVersion"
     implementation 'jp.wasabeef:glide-transformations:4.3.0'

app/src/main/java/ml/docilealligator/infinityforreddit/PollPayload.java

@@ -14,6 +14,8 @@ public class PollPayload {
     public String flairId;
     @SerializedName("flair_text")
     public String flairText;
+    @SerializedName("raw_rtjson")
+    public String richTextJSON;
     @SerializedName("post_to_twitter")
     public boolean postToTwitter = false;
     @SerializedName("sendreplies")
@@ -26,12 +28,14 @@ public class PollPayload {
     public String subredditName;
     @SerializedName("submit_type")
     public String submitType;
+    public String text;
     public String title;
     @SerializedName("validate_on_submit")
     public boolean validateOnSubmit = true;
 
     public PollPayload(String subredditName, String title, String[] options, int duration, boolean isNsfw,
-                       boolean isSpoiler, Flair flair, boolean sendReplies, String submitType) {
+                       boolean isSpoiler, Flair flair, boolean sendReplies,
+                       String submitType) {
         this.subredditName = subredditName;
         this.title = title;
         this.options = options;
@@ -45,4 +49,23 @@ public PollPayload(String subredditName, String title, String[] options, int dur
         this.sendReplies = sendReplies;
         this.submitType = submitType;
     }
+
+    public PollPayload(String subredditName, String title, String[] options, int duration, boolean isNsfw,
+                       boolean isSpoiler, Flair flair, String richTextJSON, String text, boolean sendReplies,
+                       String submitType) {
+        this.subredditName = subredditName;
+        this.title = title;
+        this.options = options;
+        this.duration = duration;
+        this.isNsfw = isNsfw;
+        this.isSpoiler = isSpoiler;
+        if (flair != null) {
+            flairId = flair.getId();
+            flairText = flair.getText();
+        }
+        this.richTextJSON = richTextJSON;
+        this.text = text;
+        this.sendReplies = sendReplies;
+        this.submitType = submitType;
+    }
 }

app/src/main/java/ml/docilealligator/infinityforreddit/RedditGalleryPayload.java

@@ -17,6 +17,7 @@ public class RedditGalleryPayload {
     @SerializedName("show_error_list")
     public boolean showErrorList = true;
     public String title;
+    public String text;
     @SerializedName("spoiler")
     public boolean isSpoiler;
     @SerializedName("nsfw")
@@ -36,11 +37,12 @@ public class RedditGalleryPayload {
     public String flairText;
     public ArrayList<Item> items;
 
-    public RedditGalleryPayload(String subredditName, String submitType, String title,
+    public RedditGalleryPayload(String subredditName, String submitType, String title, String text,
                                 boolean isSpoiler, boolean isNSFW, boolean sendReplies, Flair flair, ArrayList<Item> items) {
         this.subredditName = subredditName;
         this.submitType = submitType;
         this.title = title;
+        this.text = text;
         this.isSpoiler = isSpoiler;
         this.isNSFW = isNSFW;
         this.sendReplies = sendReplies;

app/src/main/java/ml/docilealligator/infinityforreddit/UploadedImage.java

@@ -5,16 +5,26 @@
 
 public class UploadedImage implements Parcelable {
     public String imageName;
-    public String imageUrl;
+    public String imageUrlOrKey;
+    private String caption = "";
 
-    public UploadedImage(String imageName, String imageUrl) {
+    public UploadedImage(String imageName, String imageUrlOrKey) {
         this.imageName = imageName;
-        this.imageUrl = imageUrl;
+        this.imageUrlOrKey = imageUrlOrKey;
     }
 
     protected UploadedImage(Parcel in) {
         imageName = in.readString();
-        imageUrl = in.readString();
+        imageUrlOrKey = in.readString();
+        caption = in.readString();
+    }
+
+    public String getCaption() {
+        return caption == null ? "" : caption;
+    }
+
+    public void setCaption(String caption) {
+        this.caption = caption == null ? "" : caption;
     }
 
     public static final Creator<UploadedImage> CREATOR = new Creator<UploadedImage>() {
@@ -37,6 +47,7 @@ public int describeContents() {
     @Override
     public void writeToParcel(Parcel parcel, int i) {
         parcel.writeString(imageName);
-        parcel.writeString(imageUrl);
+        parcel.writeString(imageUrlOrKey);
+        parcel.writeString(caption);
     }
 }

app/src/main/java/ml/docilealligator/infinityforreddit/activities/CommentActivity.java

@@ -240,7 +240,7 @@ public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
             Markwon postBodyMarkwon = MarkdownUtils.createFullRedditMarkwon(this,
                     miscPlugin, emoteCloseBracketInlineProcessor, emotePlugin, imageAndGifPlugin, parentTextColor,
                     parentSpoilerBackgroundColor, null);
-            CustomMarkwonAdapter markwonAdapter = MarkdownUtils.createCustomTablesAdapter(imageAndGifEntry);
+            CustomMarkwonAdapter markwonAdapter = MarkdownUtils.createCustomTablesAndImagesAdapter(imageAndGifEntry);
             markwonAdapter.setOnLongClickListener(view -> {
                 Utils.hideKeyboard(CommentActivity.this);
                 CopyTextBottomSheetFragment.show(getSupportFragmentManager(),
@@ -282,24 +282,25 @@ public void configureTheme(@NonNull MarkwonTheme.Builder builder) {
         }
 
         MarkdownBottomBarRecyclerViewAdapter adapter = new MarkdownBottomBarRecyclerViewAdapter(
-                mCustomThemeWrapper, new MarkdownBottomBarRecyclerViewAdapter.ItemClickListener() {
-            @Override
-            public void onClick(int item) {
-                MarkdownBottomBarRecyclerViewAdapter.bindEditTextWithItemClickListener(
-                        CommentActivity.this, binding.commentCommentEditText, item);
-            }
+                mCustomThemeWrapper, true,
+                new MarkdownBottomBarRecyclerViewAdapter.ItemClickListener() {
+                    @Override
+                    public void onClick(int item) {
+                        MarkdownBottomBarRecyclerViewAdapter.bindEditTextWithItemClickListener(
+                                CommentActivity.this, binding.commentCommentEditText, item);
+                    }
 
-            @Override
-            public void onUploadImage() {
-                Utils.hideKeyboard(CommentActivity.this);
-                UploadedImagesBottomSheetFragment fragment = new UploadedImagesBottomSheetFragment();
-                Bundle arguments = new Bundle();
-                arguments.putParcelableArrayList(UploadedImagesBottomSheetFragment.EXTRA_UPLOADED_IMAGES,
-                        uploadedImages);
-                fragment.setArguments(arguments);
-                fragment.show(getSupportFragmentManager(), fragment.getTag());
-            }
-        });
+                    @Override
+                    public void onUploadImage() {
+                        Utils.hideKeyboard(CommentActivity.this);
+                        UploadedImagesBottomSheetFragment fragment = new UploadedImagesBottomSheetFragment();
+                        Bundle arguments = new Bundle();
+                        arguments.putParcelableArrayList(UploadedImagesBottomSheetFragment.EXTRA_UPLOADED_IMAGES,
+                                uploadedImages);
+                        fragment.setArguments(arguments);
+                        fragment.show(getSupportFragmentManager(), fragment.getTag());
+                    }
+                });
 
         binding.commentMarkdownBottomBarRecyclerView.setLayoutManager(new LinearLayoutManagerBugFixed(this,
                 LinearLayoutManagerBugFixed.HORIZONTAL, false));
@@ -402,7 +403,7 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             return true;
         } else if (itemId == R.id.action_preview_comment_activity) {
             Intent intent = new Intent(this, FullMarkdownActivity.class);
-            intent.putExtra(FullMarkdownActivity.EXTRA_COMMENT_MARKDOWN, binding.commentCommentEditText.getText().toString());
+            intent.putExtra(FullMarkdownActivity.EXTRA_MARKDOWN, binding.commentCommentEditText.getText().toString());
             intent.putExtra(FullMarkdownActivity.EXTRA_SUBMIT_POST, true);
             startActivityForResult(intent, MARKDOWN_PREVIEW_REQUEST_CODE);
         } else if (itemId == R.id.action_send_comment_activity) {
@@ -436,8 +437,8 @@ public void sendComment(@Nullable MenuItem item) {
                     .connectionPool(new ConnectionPool(0, 1, TimeUnit.NANOSECONDS))
                     .build())
                     .build();
-            SendComment.sendComment(mExecutor, new Handler(), binding.commentCommentEditText.getText().toString(),
-                    parentFullname, parentDepth, newAuthenticatorOauthRetrofit, selectedAccount,
+            SendComment.sendComment(this, mExecutor, new Handler(), binding.commentCommentEditText.getText().toString(),
+                    parentFullname, parentDepth, uploadedImages, newAuthenticatorOauthRetrofit, selectedAccount,
                     new SendComment.SendCommentListener() {
                         @Override
                         public void sendCommentSuccess(Comment comment) {
@@ -466,7 +467,7 @@ public void sendCommentFailed(@Nullable String errorMessage) {
                                 item.getIcon().setAlpha(255);
                             }
 
-                            if (errorMessage == null || !errorMessage.equals("")) {
+                            if (errorMessage == null || errorMessage.isEmpty()) {
                                 Snackbar.make(binding.commentCoordinatorLayout, R.string.send_comment_failed, Snackbar.LENGTH_SHORT).show();
                             } else {
                                 Snackbar.make(binding.commentCoordinatorLayout, errorMessage, Snackbar.LENGTH_SHORT).show();
@@ -557,7 +558,7 @@ public void uploadImage() {
     public void captureImage() {
         Intent pictureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
         try {
-            capturedImageUri = FileProvider.getUriForFile(this, "ml.docilealligator.infinityforreddit.provider",
+            capturedImageUri = FileProvider.getUriForFile(this, getPackageName() + ".provider",
                     File.createTempFile("captured_image", ".jpg", getExternalFilesDir(Environment.DIRECTORY_PICTURES)));
             pictureIntent.putExtra(MediaStore.EXTRA_OUTPUT, capturedImageUri);
             startActivityForResult(pictureIntent, CAPTURE_IMAGE_REQUEST_CODE);
@@ -572,9 +573,16 @@ public void captureImage() {
     public void insertImageUrl(UploadedImage uploadedImage) {
         int start = Math.max(binding.commentCommentEditText.getSelectionStart(), 0);
         int end = Math.max(binding.commentCommentEditText.getSelectionEnd(), 0);
-        binding.commentCommentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
-                "[" + uploadedImage.imageName + "](" + uploadedImage.imageUrl + ")",
-                0, "[]()".length() + uploadedImage.imageName.length() + uploadedImage.imageUrl.length());
+        int realStart = Math.min(start, end);
+        if (realStart > 0 && binding.commentCommentEditText.getText().toString().charAt(realStart - 1) != '\n') {
+            binding.commentCommentEditText.getText().replace(realStart, Math.max(start, end),
+                    "\n![](" + uploadedImage.imageUrlOrKey + ")\n",
+                    0, "\n![]()\n".length() + uploadedImage.imageUrlOrKey.length());
+        } else {
+            binding.commentCommentEditText.getText().replace(realStart, Math.max(start, end),
+                    "![](" + uploadedImage.imageUrlOrKey + ")\n",
+                    0, "![]()\n".length() + uploadedImage.imageUrlOrKey.length());
+        }
     }
 
     @Override