Revert "Added file deleted image."

This reverts commit 5a2a6cbac5.
captchafix
Florens Douwes 11 years ago
parent 5a2a6cbac5
commit b74f73f316
  1. 1
      Clover/app/src/main/java/org/floens/chan/core/model/Post.java
  2. 3
      Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
  3. 15
      Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java
  4. BIN
      Clover/app/src/main/res/drawable-nodpi/file_deleted.png

@ -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;

@ -368,9 +368,6 @@ public class ChanReaderRequest extends JsonReaderRequest<List<Post>> {
case "images":
post.images = reader.nextInt();
break;
case "filedeleted":
post.fileDeleted = reader.nextInt() == 1;
break;
default:
// Unknown/ignored key
// log("Unknown/ignored key: " + key + ".");

@ -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);
}
});

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save