Super patch

.gitignore

@@ -1,5 +1,6 @@
 gps/
-Clover/app/keys.properties
+**/keys.properties
+**/keystore.jks
 Clover/app/version.properties
 Clover/captures/
 Clover/sentry.properties
@@ -27,6 +28,8 @@ local.properties
 .gradle
 build/
 *.iml
+# Layout captures
+**/*.li
 
 ## Windows detritus
 #############

Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java

@@ -102,6 +102,15 @@ public List<Filter> getEnabledFilters() {
         return enabledFilters;
     }
 
+    public List<Filter> getAllFilters() {
+        try {
+            return databaseFilterManager.getFilters().call();
+        } catch (Exception e) {
+            Logger.wtf(TAG, "Couldn't get all filters for some reason.");
+            return new ArrayList<>();
+        }
+    }
+
     @AnyThread
     public boolean matchesBoard(Filter filter, Board board) {
         if (filter.allBoards || TextUtils.isEmpty(filter.boards)) {

Clover/app/src/main/java/org/floens/chan/core/manager/WatchManager.java

@@ -813,6 +813,16 @@ public void onChanLoaderError(ChanLoaderException error) {
         public void onChanLoaderData(ChanThread thread) {
             pin.isError = false;
 
+            /*
+             * Forcibly update watched thread titles
+             * This solves the issue of when you post a thread and the site doesn't have the thread listed yet,
+             * resulting in the thread title being something like /test/918324919 instead of a proper title
+             *
+             * The thread title will be updated as soon as the site has the thread listed in the thread directory
+             *
+             */
+            pin.loadable.setTitle(PostHelper.getTitle(thread.op, pin.loadable));
+
             if (pin.thumbnailUrl == null && thread.op != null && thread.op.image() != null) {
                 pin.thumbnailUrl = thread.op.image().getThumbnailUrl().toString();
             }

Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java

@@ -88,6 +88,10 @@ public void updateDrawState(@NonNull TextPaint ds) {
         }
     }
 
+    public boolean getSpoilerState() {
+        return spoilerVisible;
+    }
+
     public static class ThreadLink {
         public String board;
         public int threadId;

Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java

@@ -80,7 +80,7 @@ public void showImages(List<PostImage> images, int position, Loadable loadable)
 
         // Do this before the view is measured, to avoid it to always loading the first two pages
         callback.setPagerItems(images, selectedPosition);
-        callback.setImageMode(images.get(selectedPosition), MultiImageView.Mode.LOWRES);
+        callback.setImageMode(images.get(selectedPosition), MultiImageView.Mode.LOWRES, true);
     }
 
     public void onViewMeasured() {
@@ -106,7 +106,7 @@ public void onExit() {
         PostImage postImage = images.get(selectedPosition);
         if (postImage.type == PostImage.Type.MOVIE) {
             // VideoView doesn't work with invisible visibility
-            callback.setImageMode(postImage, MultiImageView.Mode.LOWRES);
+            callback.setImageMode(postImage, MultiImageView.Mode.LOWRES, true);
         }
 
         callback.setPagerVisiblity(false);
@@ -172,8 +172,8 @@ public void onModeLoaded(MultiImageView multiImageView, MultiImageView.Mode mode
                     changeViewsOnInTransitionEnd = true;
                 }
                 // Transition ended or not, request loading the other side views to lowres
-                for (PostImage other : getOther(selectedPosition, false)) {
-                    callback.setImageMode(other, MultiImageView.Mode.LOWRES);
+                for (PostImage other : getOther(selectedPosition)) {
+                    callback.setImageMode(other, MultiImageView.Mode.LOWRES, false);
                 }
                 onLowResInCenter();
             } else {
@@ -197,8 +197,8 @@ private void onPageSwipedTo(int position) {
         setTitle(postImage, position);
         callback.scrollToImage(postImage);
 
-        for (PostImage other : getOther(position, false)) {
-            callback.setImageMode(other, MultiImageView.Mode.LOWRES);
+        for (PostImage other : getOther(position)) {
+            callback.setImageMode(other, MultiImageView.Mode.LOWRES, false);
         }
 
         // Already in LOWRES mode
@@ -218,11 +218,11 @@ private void onLowResInCenter() {
 
         if (imageAutoLoad(postImage) && !postImage.spoiler) {
             if (postImage.type == PostImage.Type.STATIC) {
-                callback.setImageMode(postImage, MultiImageView.Mode.BIGIMAGE);
+                callback.setImageMode(postImage, MultiImageView.Mode.BIGIMAGE, true);
             } else if (postImage.type == PostImage.Type.GIF) {
-                callback.setImageMode(postImage, MultiImageView.Mode.GIF);
+                callback.setImageMode(postImage, MultiImageView.Mode.GIF, true);
             } else if (postImage.type == PostImage.Type.MOVIE && videoAutoLoad(postImage)) {
-                callback.setImageMode(postImage, MultiImageView.Mode.MOVIE);
+                callback.setImageMode(postImage, MultiImageView.Mode.MOVIE, true);
             }
         }
 
@@ -282,18 +282,18 @@ public void onTap(MultiImageView multiImageView) {
             PostImage postImage = images.get(selectedPosition);
             if (imageAutoLoad(postImage) && !postImage.spoiler) {
                 if (postImage.type == PostImage.Type.MOVIE) {
-                    callback.setImageMode(postImage, MultiImageView.Mode.MOVIE);
+                    callback.setImageMode(postImage, MultiImageView.Mode.MOVIE, true);
                 } else {
                     onExit();
                 }
             } else {
                 MultiImageView.Mode currentMode = callback.getImageMode(postImage);
                 if (postImage.type == PostImage.Type.STATIC && currentMode != MultiImageView.Mode.BIGIMAGE) {
-                    callback.setImageMode(postImage, MultiImageView.Mode.BIGIMAGE);
+                    callback.setImageMode(postImage, MultiImageView.Mode.BIGIMAGE, true);
                 } else if (postImage.type == PostImage.Type.GIF && currentMode != MultiImageView.Mode.GIF) {
-                    callback.setImageMode(postImage, MultiImageView.Mode.GIF);
+                    callback.setImageMode(postImage, MultiImageView.Mode.GIF, true);
                 } else if (postImage.type == PostImage.Type.MOVIE && currentMode != MultiImageView.Mode.MOVIE) {
-                    callback.setImageMode(postImage, MultiImageView.Mode.MOVIE);
+                    callback.setImageMode(postImage, MultiImageView.Mode.MOVIE, true);
                 } else {
                     onExit();
                 }
@@ -377,14 +377,11 @@ private void setTitle(PostImage postImage, int position) {
                 postImage.spoiler && callback.getImageMode(postImage) == MultiImageView.Mode.LOWRES);
     }
 
-    private List<PostImage> getOther(int position, boolean all) {
-        List<PostImage> other = new ArrayList<>(3);
+    private List<PostImage> getOther(int position) {
+        List<PostImage> other = new ArrayList<>(2);
         if (position - 1 >= 0) {
             other.add(images.get(position - 1));
         }
-        if (all) {
-            other.add(images.get(position));
-        }
         if (position + 1 < images.size()) {
             other.add(images.get(position + 1));
         }
@@ -402,7 +399,7 @@ public interface Callback {
 
         void setPagerItems(List<PostImage> images, int initialIndex);
 
-        void setImageMode(PostImage postImage, MultiImageView.Mode mode);
+        void setImageMode(PostImage postImage, MultiImageView.Mode mode, boolean center);
 
         void setVolume(PostImage postImage, boolean muted);
 

Clover/app/src/main/java/org/floens/chan/core/presenter/ReplyPresenter.java

@@ -324,8 +324,8 @@ private void handleQuote(Post post, String textQuote) {
         callback.loadViewsIntoDraft(draft);
 
         String extraNewline = "";
-        if (draft.selection - 1 >= 0 && draft.selection - 1 < draft.comment.length() &&
-                draft.comment.charAt(draft.selection - 1) != '\n') {
+        if (draft.selectionStart - 1 >= 0 && draft.selectionStart - 1 < draft.comment.length() &&
+                draft.comment.charAt(draft.selectionStart - 1) != '\n') {
             extraNewline = "\n";
         }
 
@@ -360,8 +360,14 @@ private void commentInsert(String insertBefore) {
 
     private void commentInsert(String insertBefore, String insertAfter) {
         draft.comment = new StringBuilder(draft.comment)
-                .insert(draft.selection, insertBefore + insertAfter).toString();
-        draft.selection += insertBefore.length();
+                .insert(draft.selectionStart, insertBefore)
+                .insert(draft.selectionEnd + insertBefore.length(), insertAfter)
+                .toString();
+        /* Since this method is only used for quote insertion and spoilers,
+        both of which should set the cursor to right after the selected text for more typing,
+        set the selection start to the new end */
+        draft.selectionEnd += insertBefore.length();
+        draft.selectionStart = draft.selectionEnd;
         callback.loadDraftIntoViews(draft);
     }
 
@@ -438,10 +444,10 @@ public void switchPage(Page page, boolean animate, boolean useV2NoJsCaptcha) {
     private void highlightQuotes() {
         Matcher matcher = QUOTE_PATTERN.matcher(draft.comment);
 
-        // Find all occurrences of >>\d+ with start and end between selection
+        // Find all occurrences of >>\d+ with start and end between selectionStart
         int no = -1;
         while (matcher.find()) {
-            if (matcher.start() <= draft.selection && matcher.end() >= draft.selection - 1) {
+            if (matcher.start() <= draft.selectionStart && matcher.end() >= draft.selectionStart - 1) {
                 String quote = matcher.group().substring(2);
                 try {
                     no = Integer.parseInt(quote);

Clover/app/src/main/java/org/floens/chan/core/presenter/ThreadPresenter.java

@@ -26,6 +26,7 @@
 import org.floens.chan.core.manager.WatchManager;
 import org.floens.chan.core.model.ChanThread;
 import org.floens.chan.core.model.Post;
+import org.floens.chan.core.model.PostHttpIcon;
 import org.floens.chan.core.model.PostImage;
 import org.floens.chan.core.model.PostLinkable;
 import org.floens.chan.core.model.orm.Board;
@@ -485,9 +486,16 @@ public Object onPopulatePostOptions(Post post, List<FloatingMenuItem> menu,
             menu.add(new FloatingMenuItem(POST_OPTION_DELETE, R.string.post_delete));
         }
 
+        if (ChanSettings.accessibleInfo.get()) {
+            //Accessible info enabled
+            menu.add(new FloatingMenuItem(POST_OPTION_INFO, R.string.post_info));
+        } else {
+            extraMenu.add(new FloatingMenuItem(POST_OPTION_INFO, R.string.post_info));
+        }
+
         menu.add(new FloatingMenuItem(POST_OPTION_EXTRA, R.string.post_more));
 
-        extraMenu.add(new FloatingMenuItem(POST_OPTION_INFO, R.string.post_info));
+
         extraMenu.add(new FloatingMenuItem(POST_OPTION_LINKS, R.string.post_show_links));
         extraMenu.add(new FloatingMenuItem(POST_OPTION_OPEN_BROWSER, R.string.action_open_browser));
         extraMenu.add(new FloatingMenuItem(POST_OPTION_SHARE, R.string.post_share));
@@ -702,8 +710,7 @@ private void showPostInfo(Post post) {
             text.append("\n");
         }
 
-        // TODO(multi-site) get this from the timestamp
-//        text += "Date: " + post.date;
+        text.append("Posted: ").append(PostHelper.getLocalDate(post));
 
         if (!TextUtils.isEmpty(post.id)) {
             text.append("\nId: ").append(post.id);
@@ -713,9 +720,17 @@ private void showPostInfo(Post post) {
             text.append("\nTripcode: ").append(post.tripcode);
         }
 
-        /*if (!TextUtils.isEmpty(post.countryName)) {
-            text += "\nCountry: " + post.country + ", " + post.countryName;
-        }*/
+        if (post.httpIcons != null && !post.httpIcons.isEmpty()) {
+            for (PostHttpIcon icon : post.httpIcons) {
+                if (icon.url.toString().contains("troll")) {
+                    text.append("\nTroll Country: ").append(icon.name);
+                } else if (icon.url.toString().contains("country")) {
+                    text.append("\nCountry: ").append(icon.name);
+                } else if (icon.url.toString().contains("minileaf")) {
+                    text.append("\n4chan Pass Year: ").append(icon.name);
+                }
+            }
+        }
 
         if (!TextUtils.isEmpty(post.capcode)) {
             text.append("\nCapcode: ").append(post.capcode);

Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java

@@ -118,6 +118,7 @@ public String getKey() {
     public static final BooleanSetting saveOriginalFilename;
     public static final BooleanSetting shareUrl;
     public static final BooleanSetting enableReplyFab;
+    public static final BooleanSetting accessibleInfo;
     public static final BooleanSetting anonymize;
     public static final BooleanSetting anonymizeIds;
     public static final BooleanSetting showAnonymousName;
@@ -133,6 +134,7 @@ public String getKey() {
     public static final BooleanSetting neverHideToolbar;
     public static final BooleanSetting controllerSwipeable;
     public static final BooleanSetting saveBoardFolder;
+    public static final BooleanSetting saveThreadFolder;
     public static final BooleanSetting videoDefaultMuted;
     public static final BooleanSetting videoAutoLoop;
 
@@ -199,6 +201,7 @@ public String getKey() {
                 EventBus.getDefault().post(new SettingChanged<>(saveLocation)));
         saveOriginalFilename = new BooleanSetting(p, "preference_image_save_original", false);
         shareUrl = new BooleanSetting(p, "preference_image_share_url", false);
+        accessibleInfo = new BooleanSetting(p, "preference_enable_accessible_info", false);
         enableReplyFab = new BooleanSetting(p, "preference_enable_reply_fab", true);
         anonymize = new BooleanSetting(p, "preference_anonymize", false);
         anonymizeIds = new BooleanSetting(p, "preference_anonymize_ids", false);
@@ -215,6 +218,7 @@ public String getKey() {
         neverHideToolbar = new BooleanSetting(p, "preference_never_hide_toolbar", false);
         controllerSwipeable = new BooleanSetting(p, "preference_controller_swipeable", true);
         saveBoardFolder = new BooleanSetting(p, "preference_save_subboard", false);
+        saveThreadFolder = new BooleanSetting(p, "preference_save_subthread", false);
         videoDefaultMuted = new BooleanSetting(p, "preference_video_default_muted", true);
         videoAutoLoop = new BooleanSetting(p, "preference_video_loop", true);
 

Clover/app/src/main/java/org/floens/chan/core/site/SiteResolver.java

@@ -116,6 +116,7 @@ public LoadableResult resolveLoadableForUrl(String url) {
                     Loadable resolved = loadableProvider.get(resolvedLoadable);
 
                     if (resolved != null) {
+                        resolved.markedNo = resolvedLoadable.markedNo;
                         return new LoadableResult(resolved);
                     }
                 }

Clover/app/src/main/java/org/floens/chan/core/site/common/vichan/VichanApi.java

@@ -259,7 +259,14 @@ public void readPostObject(JsonReader reader, ChanReaderProcessingQueue queue) t
 
     private PostImage readPostImage(JsonReader reader, Post.Builder builder,
                                     SiteEndpoints endpoints) throws IOException {
-        reader.beginObject();
+        try {
+            reader.beginObject();
+        } catch (Exception e) {
+            //workaround for weird 8chan error where extra_files has a random empty array in it
+            reader.beginArray();
+            reader.endArray();
+            reader.beginObject();
+        }
 
         String fileId = null;
         long fileSize = 0;

Clover/app/src/main/java/org/floens/chan/core/site/http/Reply.java

@@ -43,7 +43,8 @@ public class Reply {
     public String options = "";
     public String subject = "";
     public String comment = "";
-    public int selection;
+    public int selectionStart;
+    public int selectionEnd;
     public boolean spoilerImage = false;
     public String password = "";
 }

Clover/app/src/main/java/org/floens/chan/ui/adapter/ImageViewerAdapter.java

@@ -76,18 +76,18 @@ public void finishUpdate(ViewGroup container) {
             if (view == null) {
                 Logger.w(TAG, "finishUpdate setMode view still not found");
             } else {
-                view.setMode(change.mode);
+                view.setMode(change.mode, change.center);
             }
         }
         pendingModeChanges.clear();
     }
 
-    public void setMode(final PostImage postImage, MultiImageView.Mode mode) {
+    public void setMode(final PostImage postImage, MultiImageView.Mode mode, boolean center) {
         MultiImageView view = find(postImage);
         if (view == null) {
-            pendingModeChanges.add(new ModeChange(mode, postImage));
+            pendingModeChanges.add(new ModeChange(mode, postImage, center));
         } else {
-            view.setMode(mode);
+            view.setMode(mode, center);
         }
     }
 
@@ -116,13 +116,20 @@ public MultiImageView find(PostImage postImage) {
         return null;
     }
 
+    public void toggleTransparency(PostImage postImage) {
+        MultiImageView view = find(postImage);
+        view.toggleTransparency();
+    }
+
     private static class ModeChange {
         public MultiImageView.Mode mode;
         public PostImage postImage;
+        public boolean center;
 
-        private ModeChange(MultiImageView.Mode mode, PostImage postImage) {
+        private ModeChange(MultiImageView.Mode mode, PostImage postImage, boolean center) {
             this.mode = mode;
             this.postImage = postImage;
+            this.center = center;
         }
     }
 }