Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 06:09:55 +01:00
Code Issues Projects Releases Wiki Activity

Minor code cleanups.

Browse Source
This commit is contained in:
akwizgran
2019-01-04 16:55:29 +00:00
parent c229e19452
commit 532edff642
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreview.java
View File

@@ -78,7 +78,9 @@ public class ImagePreview extends ConstraintLayout {
} }
interface ImagePreviewListener { interface ImagePreviewListener {
void onUriError(Uri uri); void onUriError(Uri uri);
void onCancel(); void onCancel();
} }

9
briar-android/src/main/java/org/briarproject/briar/android/view/ImagePreviewAdapter.java
View File

@@ -25,8 +25,7 @@ class ImagePreviewAdapter extends Adapter<ImagePreviewViewHolder> {
@LayoutRes @LayoutRes
private final int layout; private final int layout;
public ImagePreviewAdapter(Collection<Uri> items, ImagePreviewAdapter(Collection<Uri> items, ImagePreviewListener listener) {
ImagePreviewListener listener) {
this.items = new ArrayList<>(items); this.items = new ArrayList<>(items);
this.listener = listener; this.listener = listener;
this.layout = items.size() == 1 ? this.layout = items.size() == 1 ?
@@ -35,14 +34,16 @@ class ImagePreviewAdapter extends Adapter<ImagePreviewViewHolder> {
} }
@Override @Override
public ImagePreviewViewHolder onCreateViewHolder(ViewGroup viewGroup, int type) { public ImagePreviewViewHolder onCreateViewHolder(ViewGroup viewGroup,
int type) {
View v = LayoutInflater.from(viewGroup.getContext()) View v = LayoutInflater.from(viewGroup.getContext())
.inflate(layout, viewGroup, false); .inflate(layout, viewGroup, false);
return new ImagePreviewViewHolder(v, requireNonNull(listener)); return new ImagePreviewViewHolder(v, requireNonNull(listener));
} }
@Override @Override
public void onBindViewHolder(ImagePreviewViewHolder viewHolder, int position) { public void onBindViewHolder(ImagePreviewViewHolder viewHolder,
int position) {
viewHolder.bind(items.get(position)); viewHolder.bind(items.get(position));
} }

21
briar-android/src/main/java/org/briarproject/briar/android/view/TextAttachmentController.java
View File

@@ -188,6 +188,7 @@ public class TextAttachmentController extends TextSendController
} }
private static class SavedState extends AbsSavedState { private static class SavedState extends AbsSavedState {
@Nullable @Nullable
private List<Uri> imageUris; private List<Uri> imageUris;
@@ -207,16 +208,18 @@ public class TextAttachmentController extends TextSendController
out.writeList(imageUris); out.writeList(imageUris);
} }
public static final Parcelable.Creator<SavedState> CREATOR public static final Creator<SavedState> CREATOR =
= new Parcelable.Creator<SavedState>() { new Creator<SavedState>() {
public SavedState createFromParcel(Parcel in) { @Override
return new SavedState(in); public SavedState createFromParcel(Parcel in) {
} return new SavedState(in);
}
public SavedState[] newArray(int size) { @Override
return new SavedState[size]; public SavedState[] newArray(int size) {
} return new SavedState[size];
}; }
};
} }
public interface AttachImageListener { public interface AttachImageListener {