TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 11:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move add public chat button to home screen

Browse Source
This commit is contained in:
Niels Andriesse
2019-10-15 16:19:00 +11:00
parent c2d4f4b58d
commit a5b543c43c
4 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/org/thoughtcrime/securesms/ConversationListActivity.java
View File

@@ -29,6 +29,7 @@ import android.support.annotation.NonNull;
import android.support.v7.widget.Toolbar;
import android.support.v7.widget.TooltipCompat;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
@@ -44,6 +45,7 @@ import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo;
import org.thoughtcrime.securesms.lock.RegistrationLockDialog;
import org.thoughtcrime.securesms.loki.AddPublicChatActivity;
import org.thoughtcrime.securesms.loki.JazzIdenticonDrawable;
import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
import org.thoughtcrime.securesms.notifications.MessageNotifier;
@@ -127,18 +129,15 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
return false;
/*
MenuInflater inflater = this.getMenuInflater();
menu.clear();
inflater.inflate(R.menu.text_secure_normal, menu);
menu.findItem(R.id.menu_clear_passphrase).setVisible(!TextSecurePreferences.isPasswordDisabled(this));
// menu.findItem(R.id.menu_clear_passphrase).setVisible(!TextSecurePreferences.isPasswordDisabled(this));
super.onPrepareOptionsMenu(menu);
return true;
*/
}
private void initializeSearchListener() {
@@ -235,12 +234,13 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
super.onOptionsItemSelected(item);
switch (item.getItemId()) {
case R.id.menu_new_group: createGroup(); return true;
case R.id.menu_settings: handleDisplaySettings(); return true;
case R.id.menu_clear_passphrase: handleClearPassphrase(); return true;
case R.id.menu_mark_all_read: handleMarkAllRead(); return true;
case R.id.menu_invite: handleInvite(); return true;
case R.id.menu_help: handleHelp(); return true;
// case R.id.menu_new_group: createGroup(); return true;
// case R.id.menu_settings: handleDisplaySettings(); return true;
// case R.id.menu_clear_passphrase: handleClearPassphrase(); return true;
// case R.id.menu_mark_all_read: handleMarkAllRead(); return true;
// case R.id.menu_invite: handleInvite(); return true;
// case R.id.menu_help: handleHelp(); return true;
case R.id.menu_conversation_list_add_public_chat_option: addNewPublicChat(); return true;
}
return false;
@@ -321,4 +321,8 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
Toast.makeText(this, R.string.ConversationListActivity_there_is_no_browser_installed_on_your_device, Toast.LENGTH_LONG).show();
}
}
private void addNewPublicChat() {
startActivity(new Intent(this, AddPublicChatActivity.class));
}
}

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

@@ -2766,15 +2766,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (isBackspace) {
currentMentionStartIndex = -1;
mentionCandidateSelectionView.hide();
try {
for (Mention mention : mentions) {
if (!text.contains(mention.getDisplayName())) {
mentions.remove(mention);
}
ArrayList<Mention> mentionsToRemove = new ArrayList<>();
for (Mention mention : mentions) {
if (!text.contains(mention.getDisplayName())) {
mentionsToRemove.add(mention);
}
} catch (Exception exception) {
mentions.clear(); // TODO: Dirty workaround for ConcurrentModificationException
}
mentions.removeAll(mentionsToRemove);
}
if (text.length() > 0) {
if (currentMentionStartIndex > text.length()) {