diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java index 472d4507..e03bcdab 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java +++ b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java @@ -62,6 +62,7 @@ public class Post { public int fileSize; public int images = -1; public String rawComment; + public boolean fileDeleted = false; public boolean deleted = false; diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java index 3e5e6a3c..8dca5a16 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java +++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java @@ -368,6 +368,9 @@ public class ChanReaderRequest extends JsonReaderRequest> { case "images": post.images = reader.nextInt(); break; + case "filedeleted": + post.fileDeleted = reader.nextInt() == 1; + break; default: // Unknown/ignored key // log("Unknown/ignored key: " + key + "."); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java index 83eddf10..a81b8eaf 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java @@ -139,11 +139,20 @@ public class PostView extends LinearLayout implements View.OnClickListener { ta.recycle(); - if (post.hasImage) { + if (post.fileDeleted) { imageView.setVisibility(View.VISIBLE); + imageView.setImageBitmap(null); + imageView.setDefaultImageResId(R.drawable.file_deleted); + imageView.setImageUrl(null, null); + } else if (post.hasImage) { + imageView.setVisibility(View.VISIBLE); + imageView.setImageBitmap(null); + imageView.setDefaultImageResId(0); imageView.setImageUrl(post.thumbnailUrl, ChanApplication.getVolleyImageLoader()); } else { imageView.setVisibility(View.GONE); + imageView.setImageBitmap(null); + imageView.setDefaultImageResId(0); imageView.setImageUrl(null, null); } @@ -381,7 +390,9 @@ public class PostView extends LinearLayout implements View.OnClickListener { imageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - manager.onThumbnailClicked(post); + if (post.hasImage && !post.fileDeleted) { + manager.onThumbnailClicked(post); + } } }); diff --git a/Clover/app/src/main/res/drawable-nodpi/file_deleted.png b/Clover/app/src/main/res/drawable-nodpi/file_deleted.png new file mode 100644 index 00000000..aaf2a808 Binary files /dev/null and b/Clover/app/src/main/res/drawable-nodpi/file_deleted.png differ