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 e03bcdab..472d4507 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,7 +62,6 @@ 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 8dca5a16..3e5e6a3c 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,9 +368,6 @@ 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 a81b8eaf..83eddf10 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,20 +139,11 @@ public class PostView extends LinearLayout implements View.OnClickListener { ta.recycle(); - if (post.fileDeleted) { + if (post.hasImage) { 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); } @@ -390,9 +381,7 @@ public class PostView extends LinearLayout implements View.OnClickListener { imageView.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - if (post.hasImage && !post.fileDeleted) { - manager.onThumbnailClicked(post); - } + 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 deleted file mode 100644 index aaf2a808..00000000 Binary files a/Clover/app/src/main/res/drawable-nodpi/file_deleted.png and /dev/null differ