[android] Hide role-dependant private group menu items by default

and only enable them once we know our role

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

@@ -6,6 +6,8 @@ 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;
@@ -44,6 +46,7 @@ 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;
@@ -128,8 +131,9 @@ class AttachmentController {
 		}
 
 		Size size = new Size();
-		InputStream is = new BufferedInputStream(a.getStream());
-		is.mark(Integer.MAX_VALUE);
+		InputStream is = new MarkEnforcingInputStream(
+				new BufferedInputStream(a.getStream()));
+		is.mark(READ_LIMIT);
 		try {
 			// use exif to get size
 			if (h.getContentType().equals("image/jpeg")) {
@@ -142,6 +146,8 @@ 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) {
@@ -158,12 +164,11 @@ class AttachmentController {
 		}
 		// get file extension
 		String extension = getExtensionFromMimeType(size.mimeType);
-		if (extension == null) {
-			return new AttachmentItem(messageId, 0, 0, "", "", 0, 0, true);
-		}
+		boolean hasError = extension == null || size.error;
+		if (extension == null) extension = "";
 		return new AttachmentItem(messageId, size.width, size.height,
 				size.mimeType, extension, thumbnailSize.width,
-				thumbnailSize.height, size.error);
+				thumbnailSize.height, hasError);
 	}
 
 	@Nullable

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

@@ -77,6 +77,7 @@ public class ImageFragment extends Fragment {
 				viewModelFactory).get(ImageViewModel.class);
 
 		photoView = v.findViewById(R.id.photoView);
+		photoView.setScaleLevels(1, 2, 4);
 		photoView.setOnClickListener(view -> viewModel.clickImage());
 
 		// Request Listener
@@ -113,9 +114,10 @@ public class ImageFragment extends Fragment {
 		// Load Image
 		GlideApp.with(this)
 				.load(attachment)
+				// TODO allow if size < maxTextureSize ?
+//				.override(SIZE_ORIGINAL)
 				.diskCacheStrategy(NONE)
 				.error(R.drawable.ic_image_broken)
-				.dontTransform()
 				.addListener(listener)
 				.into(photoView);
 

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

@@ -50,9 +50,12 @@ 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 final MutableLiveData<Boolean> saveState = new MutableLiveData<>();
 	private int toolbarTop, toolbarBottom;
 
 	@Inject
@@ -106,8 +109,9 @@ public class ImageViewModel extends AndroidViewModel {
 	}
 
 	/**
-	 * A LiveData that is true if the image was saved,
-	 * false if there was an error and null otherwise.
+	 * 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.
 	 *
 	 * Call {@link #onSaveStateSeen()} after consuming an update.
 	 */
@@ -126,7 +130,7 @@ public class ImageViewModel extends AndroidViewModel {
 	@UiThread
 	void saveImage(AttachmentItem attachment, @Nullable Uri uri) {
 		if (uri == null) {
-			saveState.setValue(false);
+			saveState.setValue(true);
 		} else {
 			saveImage(attachment, () -> getOutputStream(uri), null);
 		}

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

@@ -138,7 +138,6 @@ 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);
 	}
@@ -208,7 +207,6 @@ 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/menu/group_actions.xml

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