DO NOT MERGE: Return multiple fake image attachements in MessagingManager

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -20,7 +20,6 @@ import org.briarproject.briar.android.contact.ContactModule;
 import org.briarproject.briar.android.conversation.AliasDialogFragment;
 import org.briarproject.briar.android.conversation.ConversationActivity;
 import org.briarproject.briar.android.conversation.ImageActivity;
-import org.briarproject.briar.android.conversation.ImageFragment;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
@@ -219,6 +218,4 @@ public interface ActivityComponent {
 
 	void inject(AliasDialogFragment aliasDialogFragment);
 
-	void inject(ImageFragment imageFragment);
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentController.java

@@ -6,8 +6,6 @@ import android.support.annotation.Nullable;
 import android.support.media.ExifInterface;
 import android.webkit.MimeTypeMap;
 
-import com.bumptech.glide.util.MarkEnforcingInputStream;
-
 import org.briarproject.bramble.api.Pair;
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
@@ -46,7 +44,6 @@ class AttachmentController {
 
 	private static final Logger LOG =
 			getLogger(AttachmentController.class.getName());
-	private static final int READ_LIMIT = 1024 * 8192;
 
 	private final MessagingManager messagingManager;
 	private final int defaultSize;
@@ -131,9 +128,8 @@ class AttachmentController {
 		}
 
 		Size size = new Size();
-		InputStream is = new MarkEnforcingInputStream(
-				new BufferedInputStream(a.getStream()));
-		is.mark(READ_LIMIT);
+		InputStream is = new BufferedInputStream(a.getStream());
+		is.mark(Integer.MAX_VALUE);
 		try {
 			// use exif to get size
 			if (h.getContentType().equals("image/jpeg")) {
@@ -146,8 +142,6 @@ class AttachmentController {
 			// use BitmapFactory to get size
 			if (size.error) {
 				is.reset();
-				// need to mark again to re-add read limit
-				is.mark(READ_LIMIT);
 				size = getSizeFromBitmap(is);
 			}
 		} catch (IOException e) {
@@ -164,11 +158,12 @@ class AttachmentController {
 		}
 		// get file extension
 		String extension = getExtensionFromMimeType(size.mimeType);
-		boolean hasError = extension == null || size.error;
-		if (extension == null) extension = "";
+		if (extension == null) {
+			return new AttachmentItem(messageId, 0, 0, "", "", 0, 0, true);
+		}
 		return new AttachmentItem(messageId, size.width, size.height,
 				size.mimeType, extension, thumbnailSize.width,
-				thumbnailSize.height, hasError);
+				thumbnailSize.height, size.error);
 	}
 
 	@Nullable

briar-android/src/main/java/org/briarproject/briar/android/conversation/AttachmentItem.java

@@ -2,7 +2,6 @@ package org.briarproject.briar.android.conversation;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
 
 import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
 import org.briarproject.bramble.api.sync.MessageId;
@@ -112,10 +111,4 @@ public class AttachmentItem implements Parcelable {
 		dest.writeByte((byte) (hasError ? 1 : 0));
 	}
 
-	@Override
-	public boolean equals(@Nullable Object o) {
-		return o instanceof AttachmentItem &&
-				messageId.equals(((AttachmentItem) o).messageId);
-	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java

@@ -121,9 +121,8 @@ import static org.briarproject.bramble.util.StringUtils.isNullOrEmpty;
 import static org.briarproject.briar.android.TestingConstants.FEATURE_FLAG_IMAGE_ATTACHMENTS;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_ATTACH_IMAGE;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_INTRODUCTION;
-import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT_POSITION;
+import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT;
 import static org.briarproject.briar.android.conversation.ImageActivity.DATE;
-import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENTS;
 import static org.briarproject.briar.android.conversation.ImageActivity.NAME;
 import static org.briarproject.briar.android.settings.SettingsFragment.SETTINGS_NAMESPACE;
 import static org.briarproject.briar.android.util.UiUtils.getAvatarTransitionName;
@@ -813,11 +812,8 @@ public class ConversationActivity extends BriarActivity
 		} else {
 			name = getString(R.string.you);
 		}
-		ArrayList<AttachmentItem> attachments =
-				new ArrayList<>(messageItem.getAttachments());
 		Intent i = new Intent(this, ImageActivity.class);
-		i.putParcelableArrayListExtra(ATTACHMENTS, attachments);
-		i.putExtra(ATTACHMENT_POSITION, attachments.indexOf(item));
+		i.putExtra(ATTACHMENT, item);
 		i.putExtra(NAME, name);
 		i.putExtra(DATE, messageItem.getTime());
 		if (SDK_INT >= 23) {

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageActivity.java

@@ -4,18 +4,15 @@ import android.arch.lifecycle.ViewModelProvider;
 import android.arch.lifecycle.ViewModelProviders;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
+import android.graphics.drawable.Animatable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.AppBarLayout;
 import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v4.view.ViewPager;
 import android.support.v7.app.AlertDialog.Builder;
 import android.support.v7.widget.Toolbar;
 import android.transition.Fade;
@@ -23,18 +20,23 @@ import android.transition.Transition;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
 import android.view.Window;
 import android.widget.TextView;
 
+import com.bumptech.glide.load.DataSource;
+import com.bumptech.glide.load.engine.GlideException;
+import com.bumptech.glide.request.RequestListener;
+import com.bumptech.glide.request.target.Target;
+import com.github.chrisbanes.photoview.PhotoView;
+
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.conversation.glide.GlideApp;
 import org.briarproject.briar.android.view.PullDownLayout;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Locale;
 
 import javax.inject.Inject;
@@ -51,15 +53,16 @@ import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;
 import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE;
 import static android.view.View.VISIBLE;
 import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;
+import static android.widget.ImageView.ScaleType.FIT_START;
+import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
 import static java.util.Objects.requireNonNull;
 import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_SAVE_ATTACHMENT;
 import static org.briarproject.briar.android.util.UiUtils.formatDateAbsolute;
 
 public class ImageActivity extends BriarActivity
-		implements PullDownLayout.Callback, OnGlobalLayoutListener {
+		implements PullDownLayout.Callback {
 
-	final static String ATTACHMENTS = "attachments";
-	final static String ATTACHMENT_POSITION = "position";
+	final static String ATTACHMENT = "attachment";
 	final static String NAME = "name";
 	final static String DATE = "date";
 
@@ -69,8 +72,8 @@ public class ImageActivity extends BriarActivity
 	private ImageViewModel viewModel;
 	private PullDownLayout layout;
 	private AppBarLayout appBarLayout;
-	private ViewPager viewPager;
-	private List<AttachmentItem> attachments;
+	private PhotoView photoView;
+	private AttachmentItem attachment;
 
 	@Override
 	public void injectActivity(ActivityComponent component) {
@@ -99,7 +102,6 @@ public class ImageActivity extends BriarActivity
 		layout = findViewById(R.id.layout);
 		layout.getBackground().setAlpha(255);
 		layout.setCallback(this);
-		layout.getViewTreeObserver().addOnGlobalLayoutListener(this);
 
 		// Status Bar
 		if (SDK_INT >= 21) {
@@ -116,29 +118,59 @@ public class ImageActivity extends BriarActivity
 		TextView dateView = toolbar.findViewById(R.id.dateView);
 
 		// Intent Extras
-		Intent i = getIntent();
-		attachments = i.getParcelableArrayListExtra(ATTACHMENTS);
-		int position = i.getIntExtra(ATTACHMENT_POSITION, -1);
-		if (position == -1) throw new IllegalStateException();
-		String name = i.getStringExtra(NAME);
-		long time = i.getLongExtra(DATE, 0);
+		attachment = getIntent().getParcelableExtra(ATTACHMENT);
+		String name = getIntent().getStringExtra(NAME);
+		long time = getIntent().getLongExtra(DATE, 0);
 		String date = formatDateAbsolute(this, time);
 		contactName.setText(name);
 		dateView.setText(date);
 
-		// Set up image ViewPager
-		viewPager = findViewById(R.id.viewPager);
-		ImagePagerAdapter pagerAdapter =
-				new ImagePagerAdapter(getSupportFragmentManager());
-		viewPager.setAdapter(pagerAdapter);
-		viewPager.setCurrentItem(position);
-
+		// Image View
+		photoView = findViewById(R.id.photoView);
 		if (SDK_INT >= 16) {
-			viewModel.getOnImageClicked().observe(this, this::onImageClicked);
+			photoView.setOnClickListener(view -> toggleSystemUi());
 			window.getDecorView().setSystemUiVisibility(
 					SYSTEM_UI_FLAG_LAYOUT_STABLE |
 							SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
 		}
+
+		// Request Listener
+		RequestListener<Drawable> listener = new RequestListener<Drawable>() {
+			@Override
+			public boolean onLoadFailed(@Nullable GlideException e,
+					Object model, Target<Drawable> target,
+					boolean isFirstResource) {
+				supportStartPostponedEnterTransition();
+				return false;
+			}
+
+			@Override
+			public boolean onResourceReady(Drawable resource, Object model,
+					Target<Drawable> target, DataSource dataSource,
+					boolean isFirstResource) {
+				if (SDK_INT >= 21 && !(resource instanceof Animatable)) {
+					// set transition name only when not animatable,
+					// because the animation won't start otherwise
+					photoView.setTransitionName(
+							attachment.getTransitionName());
+				}
+				// Move image to the top if overlapping toolbar
+				if (isOverlappingToolbar(resource)) {
+					photoView.setScaleType(FIT_START);
+				}
+				supportStartPostponedEnterTransition();
+				return false;
+			}
+		};
+
+		// Load Image
+		GlideApp.with(this)
+				.load(attachment)
+				.diskCacheStrategy(NONE)
+				.error(R.drawable.ic_image_broken)
+				.dontTransform()
+				.addListener(listener)
+				.into(photoView);
 	}
 
 	@Override
@@ -161,23 +193,11 @@ public class ImageActivity extends BriarActivity
 		}
 	}
 
-	@Override
-	public void onGlobalLayout() {
-		viewModel.setToolbarPosition(
-				appBarLayout.getTop(), appBarLayout.getBottom()
-		);
-		if (SDK_INT >= 16) {
-			layout.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-		} else {
-			layout.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-		}
-	}
-
 	@Override
 	protected void onActivityResult(int request, int result, Intent data) {
 		super.onActivityResult(request, result, data);
 		if (request == REQUEST_SAVE_ATTACHMENT && result == RESULT_OK) {
-			viewModel.saveImage(getVisibleAttachment(), data.getData());
+			viewModel.saveImage(attachment, data.getData());
 		}
 	}
 
@@ -205,14 +225,6 @@ public class ImageActivity extends BriarActivity
 		supportFinishAfterTransition();
 	}
 
-	@RequiresApi(api = 16)
-	private void onImageClicked(@Nullable Boolean clicked) {
-		if (clicked != null && clicked) {
-			toggleSystemUi();
-			viewModel.onOnImageClickSeen();
-		}
-	}
-
 	@RequiresApi(api = 16)
 	private void toggleSystemUi() {
 		View decorView = getWindow().getDecorView();
@@ -247,13 +259,29 @@ public class ImageActivity extends BriarActivity
 				.start();
 	}
 
+	private boolean isOverlappingToolbar(Drawable drawable) {
+		int width = drawable.getIntrinsicWidth();
+		int height = drawable.getIntrinsicHeight();
+		float widthPercentage = photoView.getWidth() / (float) width;
+		float heightPercentage = photoView.getHeight() / (float) height;
+		float scaleFactor = Math.min(widthPercentage, heightPercentage);
+		int realWidth = (int) (width * scaleFactor);
+		int realHeight = (int) (height * scaleFactor);
+		// return if photo doesn't use the full width,
+		// because it will be moved to the right otherwise
+		if (realWidth < photoView.getWidth()) return false;
+		int drawableTop = (photoView.getHeight() - realHeight) / 2;
+		return drawableTop < appBarLayout.getBottom() &&
+				drawableTop != appBarLayout.getTop();
+	}
+
 	private void showSaveImageDialog() {
 		OnClickListener okListener = (dialog, which) -> {
 			if (SDK_INT >= 19) {
 				Intent intent = getCreationIntent();
 				startActivityForResult(intent, REQUEST_SAVE_ATTACHMENT);
 			} else {
-				viewModel.saveImage(getVisibleAttachment());
+				viewModel.saveImage(attachment);
 			}
 		};
 		Builder builder = new Builder(this, R.style.BriarDialogTheme);
@@ -275,7 +303,7 @@ public class ImageActivity extends BriarActivity
 		String fileName = sdf.format(new Date());
 		Intent intent = new Intent(ACTION_CREATE_DOCUMENT);
 		intent.addCategory(CATEGORY_OPENABLE);
-		intent.setType(getVisibleAttachment().getMimeType());
+		intent.setType(attachment.getMimeType());
 		intent.putExtra(EXTRA_TITLE, fileName);
 		return intent;
 	}
@@ -292,26 +320,4 @@ public class ImageActivity extends BriarActivity
 		viewModel.onSaveStateSeen();
 	}
 
-	AttachmentItem getVisibleAttachment() {
-		return attachments.get(viewPager.getCurrentItem());
-	}
-
-	private class ImagePagerAdapter extends FragmentStatePagerAdapter {
-
-		private ImagePagerAdapter(FragmentManager fm) {
-			super(fm);
-		}
-
-		@Override
-		public Fragment getItem(int position) {
-			return ImageFragment.newInstance(attachments.get(position));
-		}
-
-		@Override
-		public int getCount() {
-			return attachments.size();
-		}
-
-	}
-
 }

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageFragment.java

@@ -1,127 +0,0 @@
-package org.briarproject.briar.android.conversation;
-
-import android.arch.lifecycle.ViewModelProvider;
-import android.arch.lifecycle.ViewModelProviders;
-import android.graphics.drawable.Animatable;
-import android.graphics.drawable.Drawable;
-import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.bumptech.glide.load.DataSource;
-import com.bumptech.glide.load.engine.GlideException;
-import com.bumptech.glide.request.RequestListener;
-import com.bumptech.glide.request.target.Target;
-import com.github.chrisbanes.photoview.PhotoView;
-
-import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
-import org.briarproject.briar.R;
-import org.briarproject.briar.android.activity.BaseActivity;
-import org.briarproject.briar.android.conversation.glide.GlideApp;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-import javax.inject.Inject;
-
-import static android.os.Build.VERSION.SDK_INT;
-import static android.widget.ImageView.ScaleType.FIT_START;
-import static com.bumptech.glide.load.engine.DiskCacheStrategy.NONE;
-import static org.briarproject.bramble.api.nullsafety.NullSafety.requireNonNull;
-import static org.briarproject.briar.android.conversation.ImageActivity.ATTACHMENT_POSITION;
-
-@MethodsNotNullByDefault
-@ParametersAreNonnullByDefault
-public class ImageFragment extends Fragment {
-
-	@Inject
-	ViewModelProvider.Factory viewModelFactory;
-
-	private AttachmentItem attachment;
-	private ImageViewModel viewModel;
-	private PhotoView photoView;
-
-	static ImageFragment newInstance(AttachmentItem a) {
-		ImageFragment f = new ImageFragment();
-		Bundle args = new Bundle();
-		args.putParcelable(ATTACHMENT_POSITION, a);
-		f.setArguments(args);
-		return f;
-	}
-
-	@Override
-	public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-		super.onActivityCreated(savedInstanceState);
-		BaseActivity a = (BaseActivity) requireNonNull(getActivity());
-		a.getActivityComponent().inject(this);
-	}
-
-	@Override
-	public void onCreate(@Nullable Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		Bundle args = requireNonNull(getArguments());
-		attachment = requireNonNull(args.getParcelable(ATTACHMENT_POSITION));
-	}
-
-	@Nullable
-	@Override
-	public View onCreateView(LayoutInflater inflater,
-			@Nullable ViewGroup container,
-			@Nullable Bundle savedInstanceState) {
-		View v = inflater.inflate(R.layout.fragment_image, container,
-				false);
-
-		viewModel = ViewModelProviders.of(requireNonNull(getActivity()),
-				viewModelFactory).get(ImageViewModel.class);
-
-		photoView = v.findViewById(R.id.photoView);
-		photoView.setScaleLevels(1, 2, 4);
-		photoView.setOnClickListener(view -> viewModel.clickImage());
-
-		// Request Listener
-		RequestListener<Drawable> listener = new RequestListener<Drawable>() {
-			@Override
-			public boolean onLoadFailed(@Nullable GlideException e,
-					Object model, Target<Drawable> target,
-					boolean isFirstResource) {
-				if (getActivity() != null)
-					getActivity().supportStartPostponedEnterTransition();
-				return false;
-			}
-
-			@Override
-			public boolean onResourceReady(Drawable resource, Object model,
-					Target<Drawable> target, DataSource dataSource,
-					boolean isFirstResource) {
-				if (SDK_INT >= 21 && !(resource instanceof Animatable)) {
-					// set transition name only when not animatable,
-					// because the animation won't start otherwise
-					photoView.setTransitionName(
-							attachment.getTransitionName());
-				}
-				// Move image to the top if overlapping toolbar
-				if (viewModel.isOverlappingToolbar(photoView, resource)) {
-					photoView.setScaleType(FIT_START);
-				}
-				if (getActivity() != null)
-					getActivity().supportStartPostponedEnterTransition();
-				return false;
-			}
-		};
-
-		// Load Image
-		GlideApp.with(this)
-				.load(attachment)
-				// TODO allow if size < maxTextureSize ?
-//				.override(SIZE_ORIGINAL)
-				.diskCacheStrategy(NONE)
-				.error(R.drawable.ic_image_broken)
-				.addListener(listener)
-				.into(photoView);
-
-		return v;
-	}
-
-}

briar-android/src/main/java/org/briarproject/briar/android/conversation/ImageViewModel.java

@@ -4,11 +4,9 @@ import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.MutableLiveData;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.support.annotation.Nullable;
 import android.support.annotation.UiThread;
-import android.view.View;
 
 import org.briarproject.bramble.api.db.DatabaseExecutor;
 import org.briarproject.bramble.api.db.DbException;
@@ -50,13 +48,7 @@ public class ImageViewModel extends AndroidViewModel {
 	@IoExecutor
 	private final Executor ioExecutor;
 
-	/**
-	 * true means there was an error saving the image, false if image was saved.
-	 */
 	private final MutableLiveData<Boolean> saveState = new MutableLiveData<>();
-	private final MutableLiveData<Boolean> imageClicked =
-			new MutableLiveData<>();
-	private int toolbarTop, toolbarBottom;
 
 	@Inject
 	ImageViewModel(Application application,
@@ -69,49 +61,9 @@ public class ImageViewModel extends AndroidViewModel {
 		this.ioExecutor = ioExecutor;
 	}
 
-	void clickImage() {
-		imageClicked.setValue(true);
-	}
-
 	/**
-	 * A LiveData that is true if the image was clicked,
-	 * false if it wasn't.
-	 *
-	 * Call {@link #onOnImageClickSeen()} after consuming an update.
-	 */
-	LiveData<Boolean> getOnImageClicked() {
-		return imageClicked;
-	}
-
-	@UiThread
-	void onOnImageClickSeen() {
-		imageClicked.setValue(false);
-	}
-
-	void setToolbarPosition(int top, int bottom) {
-		toolbarTop = top;
-		toolbarBottom = bottom;
-	}
-
-	boolean isOverlappingToolbar(View screenView, Drawable drawable) {
-		int width = drawable.getIntrinsicWidth();
-		int height = drawable.getIntrinsicHeight();
-		float widthPercentage = screenView.getWidth() / (float) width;
-		float heightPercentage = screenView.getHeight() / (float) height;
-		float scaleFactor = Math.min(widthPercentage, heightPercentage);
-		int realWidth = (int) (width * scaleFactor);
-		int realHeight = (int) (height * scaleFactor);
-		// return if image doesn't use the full width,
-		// because it will be moved to the right otherwise
-		if (realWidth < screenView.getWidth()) return false;
-		int drawableTop = (screenView.getHeight() - realHeight) / 2;
-		return drawableTop < toolbarBottom && drawableTop != toolbarTop;
-	}
-
-	/**
-	 * A LiveData that is true if there was an error
-	 * and false if the image was saved.
-	 * It can be null otherwise, if no image was saved recently.
+	 * A LiveData that is true if the image was saved,
+	 * false if there was an error and null otherwise.
 	 *
 	 * Call {@link #onSaveStateSeen()} after consuming an update.
 	 */
@@ -130,7 +82,7 @@ public class ImageViewModel extends AndroidViewModel {
 	@UiThread
 	void saveImage(AttachmentItem attachment, @Nullable Uri uri) {
 		if (uri == null) {
-			saveState.setValue(true);
+			saveState.setValue(false);
 		} else {
 			saveImage(attachment, () -> getOutputStream(uri), null);
 		}

briar-android/src/main/java/org/briarproject/briar/android/privategroup/conversation/GroupActivity.java

@@ -138,6 +138,7 @@ public class GroupActivity extends
 		inviteMenuItem = menu.findItem(R.id.action_group_invite);
 		leaveMenuItem = menu.findItem(R.id.action_group_leave);
 		dissolveMenuItem = menu.findItem(R.id.action_group_dissolve);
+		showMenuItems();
 
 		return super.onCreateOptionsMenu(menu);
 	}
@@ -207,6 +208,7 @@ public class GroupActivity extends
 	}
 
 	private void showMenuItems() {
+		if (leaveMenuItem == null || dissolveMenuItem == null) return;
 		if (isCreator) {
 			revealMenuItem.setVisible(false);
 			inviteMenuItem.setVisible(true);

briar-android/src/main/res/layout/activity_image.xml

@@ -8,11 +8,12 @@
 	android:background="@color/briar_black"
 	tools:context=".android.conversation.ImageActivity">
 
-	<android.support.v4.view.ViewPager
-		android:id="@+id/viewPager"
+	<com.github.chrisbanes.photoview.PhotoView
+		android:id="@+id/photoView"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		tools:background="@color/briar_green_light"/>
+		tools:ignore="ContentDescription"
+		tools:srcCompat="@tools:sample/backgrounds/scenic"/>
 
 	<android.support.design.widget.AppBarLayout
 		android:id="@+id/appBarLayout"

briar-android/src/main/res/layout/fragment_image.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.github.chrisbanes.photoview.PhotoView
-	android:id="@+id/photoView"
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
-	android:layout_height="match_parent"
-	tools:ignore="ContentDescription"
-	tools:srcCompat="@tools:sample/backgrounds/scenic"/>

briar-android/src/main/res/menu/group_actions.xml

@@ -1,16 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
-	xmlns:tools="http://schemas.android.com/tools">
+	xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<item
 		android:id="@+id/action_group_invite"
 		android:icon="@drawable/social_share_white"
 		android:title="@string/groups_invite_members"
-		android:visible="false"
-		app:showAsAction="ifRoom"
-		tools:visible="true"/>
+		app:showAsAction="ifRoom"/>
 
 	<item
 		android:id="@+id/action_group_member_list"
@@ -22,24 +19,18 @@
 		android:id="@+id/action_group_reveal"
 		android:icon="@drawable/ic_visibility_white"
 		android:title="@string/groups_reveal_contacts"
-		android:visible="false"
-		app:showAsAction="never"
-		tools:visible="true"/>
+		app:showAsAction="never"/>
 
 	<item
 		android:id="@+id/action_group_leave"
 		android:icon="@drawable/action_delete_white"
 		android:title="@string/groups_leave"
-		android:visible="false"
-		app:showAsAction="never"
-		tools:visible="true"/>
+		app:showAsAction="never"/>
 
 	<item
 		android:id="@+id/action_group_dissolve"
 		android:icon="@drawable/action_delete_white"
 		android:title="@string/groups_dissolve"
-		android:visible="false"
-		app:showAsAction="never"
-		tools:visible="true"/>
+		app:showAsAction="never"/>
 
 </menu>

briar-core/src/main/java/org/briarproject/briar/messaging/MessagingManagerImpl.java

@@ -32,11 +32,11 @@ import org.briarproject.briar.api.messaging.PrivateMessageHeader;
 import org.briarproject.briar.api.messaging.event.PrivateMessageReceivedEvent;
 import org.briarproject.briar.client.ConversationClientImpl;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
@@ -44,7 +44,7 @@ import javax.annotation.concurrent.Immutable;
 import javax.inject.Inject;
 
 import static java.util.Collections.emptyList;
-import static org.briarproject.bramble.util.StringUtils.fromHexString;
+import static java.util.logging.Logger.getLogger;
 import static org.briarproject.briar.client.MessageTrackerConstants.MSG_KEY_READ;
 
 @Immutable
@@ -219,8 +219,18 @@ class MessagingManagerImpl extends ConversationClientImpl
 				long timestamp = meta.getLong("timestamp");
 				boolean local = meta.getBoolean("local");
 				boolean read = meta.getBoolean("read");
+				// TODO replace fake attachments by real ones
+				int num = (int) (timestamp % 5);
+				boolean hasText = num == 0 || id.hashCode() % 2 == 0;
+				List<AttachmentHeader> attachments = new ArrayList<>(num);
+				for (int i = 0; i < num; i++) {
+					byte[] aIdBytes = id.getBytes().clone();
+					aIdBytes[0] = (byte) i;
+					MessageId aId = new MessageId(aIdBytes);
+					attachments.add(new AttachmentHeader(aId, "image/jpeg"));
+				}
 				headers.add(new PrivateMessageHeader(id, g, timestamp, local,
-						read, s.isSent(), s.isSeen(), true, emptyList()));
+						read, s.isSent(), s.isSeen(), hasText, attachments));
 			} catch (FormatException e) {
 				throw new DbException(e);
 			}
@@ -241,11 +251,30 @@ class MessagingManagerImpl extends ConversationClientImpl
 	@Override
 	public Attachment getAttachment(MessageId m) {
 		// TODO add real implementation
-		byte[] bytes = fromHexString("89504E470D0A1A0A0000000D49484452" +
-				"000000010000000108060000001F15C4" +
-				"890000000A49444154789C6300010000" +
-				"0500010D0A2DB40000000049454E44AE426082");
-		return new Attachment(new ByteArrayInputStream(bytes));
+		String[] files = new String[] {
+//				"error_animated.gif",
+//				"error_high.jpg",
+//				"error_wide.jpg",
+//				"error_huge.gif",
+//				"error_large.gif",
+//				"error_malformed.jpg",
+//				"wide.jpg",
+//				"high.jpg",
+//				"small.png",
+				"kitten1.jpg",
+				"kitten2.jpg",
+				"kitten3.gif",
+				"kitten4.jpg",
+				"kitten5.jpg",
+				"kitten6.png",
+		};
+		int index = Math.abs(m.hashCode() % files.length);
+		String file = files[index];
+		getLogger(MessagingManagerImpl.class.getName())
+				.warning("Loading file: " + file);
+
+		InputStream is = getClass().getClassLoader().getResourceAsStream(file);
+		return new Attachment(is);
 	}
 
 }