TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-24 16:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quick fix closed group UI issues

Browse Source
This commit is contained in:
Niels Andriesse 2020-02-04 14:31:44 +11:00
parent 3e5c6126a3
commit 2945390842
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/menu/conversation_push_group_options.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?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"> <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" android:title="@string/conversation__menu_edit_group"
app:showAsAction="collapseActionView" /> app:showAsAction="collapseActionView" /> -->
<item android:id="@+id/menu_leave" <item android:id="@+id/menu_leave"
android:title="@string/conversation__menu_leave_group" android:title="@string/conversation__menu_leave_group"

23
src/org/thoughtcrime/securesms/GroupMembersDialog.java
View File

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

4
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

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