Quick fix closed group UI issues

res/menu/conversation_push_group_options.xml

@@ -1,9 +1,9 @@
 <?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">
 
-    <item android:id="@+id/menu_edit_group"
+    <!-- <item android:id="@+id/menu_edit_group"
           android:title="@string/conversation__menu_edit_group"
-          app:showAsAction="collapseActionView" />
+          app:showAsAction="collapseActionView" /> -->
 
     <item android:id="@+id/menu_leave"
           android:title="@string/conversation__menu_leave_group"

src/org/thoughtcrime/securesms/GroupMembersDialog.java

@@ -2,14 +2,12 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.os.AsyncTask;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientExporter;
 import org.thoughtcrime.securesms.util.Util;
 
 import java.util.LinkedList;
@@ -64,16 +62,17 @@ public class GroupMembersDialog extends AsyncTask<Void, Void, List<Recipient>> {
 
     @Override
     public void onClick(DialogInterface dialogInterface, int item) {
-      Recipient recipient = groupMembers.get(item);
-
-      if (recipient.getContactUri() != null) {
-        Intent intent = new Intent(context, RecipientPreferenceActivity.class);
-        intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress());
-
-        context.startActivity(intent);
-      } else {
-        context.startActivity(RecipientExporter.export(recipient).asAddContactIntent());
-      }
+      // Loki - Do nothing
+//      Recipient recipient = groupMembers.get(item);
+//
+//      if (recipient.getContactUri() != null) {
+//        Intent intent = new Intent(context, RecipientPreferenceActivity.class);
+//        intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress());
+//
+//        context.startActivity(intent);
+//      } else {
+//        context.startActivity(RecipientExporter.export(recipient).asAddContactIntent());
+//      }
     }
   }
 

src/org/thoughtcrime/securesms/conversation/ConversationActivity.java

@@ -874,7 +874,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     case R.id.menu_group_recipients:          handleDisplayGroupRecipients();                    return true;
     case R.id.menu_distribution_broadcast:    handleDistributionBroadcastEnabled(item);          return true;
     case R.id.menu_distribution_conversation: handleDistributionConversationEnabled(item);       return true;
-    case R.id.menu_edit_group:                handleEditPushGroup();                             return true;
+//    case R.id.menu_edit_group:                handleEditPushGroup();                             return true;
     case R.id.menu_leave:                     handleLeavePushGroup();                            return true;
     case R.id.menu_invite:                    handleInviteLink();                                return true;
     case R.id.menu_mute_notifications:        handleMuteNotifications();                         return true;
@@ -2112,7 +2112,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void setGroupShareProfileReminder(@NonNull Recipient recipient) {
     if (recipient.isPushGroupRecipient() && !recipient.isProfileSharing() && !recipient.getAddress().isPublicChat() && !recipient.getAddress().isRSSFeed()) {
       groupShareProfileView.get().setRecipient(recipient);
-      groupShareProfileView.get().setVisibility(View.VISIBLE);
+      groupShareProfileView.get().setVisibility(View.GONE); // Loki - Always hide for now
     } else if (groupShareProfileView.resolved()) {
       groupShareProfileView.get().setVisibility(View.GONE);
     }