TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-28 12:35:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
86b3de2a93
session-android/src/org/thoughtcrime/securesms/ConversationFragment.java

230 lines
8.4 KiB
Java
Raw Normal View History

New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
package org.thoughtcrime.securesms;
Fix success/failure status on conversation item.
2012-08-04 00:34:09 +00:00
import android.app.Activity;
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.database.Cursor;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader;
import android.text.ClipboardManager;
import android.view.ContextMenu;
Allow to resend a failed message Add an option to the context menu of the message to resend it if it has failed.
2013-10-13 10:53:41 +00:00
import android.view.MenuItem;
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.CursorAdapter;
import com.actionbarsherlock.app.SherlockListFragment;
Move common crypto classes into TextSecureLibrary. 1) Move all the crypto classes from securesms.crypto. 2) Move all the crypto storage from securesms.database.keys 3) Replace the old imported BC code with spongycastle.
2013-08-18 01:37:18 +00:00
import org.whispersystems.textsecure.crypto.MasterSecret;
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.loaders.ConversationLoader;
Major reorganization of view/model interactions. Mostly, the inheritance graph for MessageRecord/MmsMessageRecord was all messed up, and each class was overloaded for things it shouldn't have been. 1) Broke MessageRecord/MmsMessageRecord up into: DisplayRecord, ThreadRecord, MessageRecord, SmsMessageRecord, NotificationMmsMessageRecord, and MediaMmsMessageRecord. 2) Updated all the adapters/views to keep pace with that change.
2012-10-28 23:04:24 +00:00
import org.thoughtcrime.securesms.database.model.MessageRecord;
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
import org.thoughtcrime.securesms.recipients.Recipients;
Allow to resend a failed message Add an option to the context menu of the message to resend it if it has failed.
2013-10-13 10:53:41 +00:00
import org.thoughtcrime.securesms.sms.MessageSender;
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
import java.sql.Date;
import java.text.SimpleDateFormat;
public class ConversationFragment extends SherlockListFragment
implements LoaderManager.LoaderCallbacks<Cursor>
{
Fix success/failure status on conversation item.
2012-08-04 00:34:09 +00:00
private ConversationFragmentListener listener;
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
private MasterSecret masterSecret;
private Recipients recipients;
private long threadId;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
return inflater.inflate(R.layout.conversation_fragment, container, false);
}
@Override
public void onActivityCreated(Bundle bundle) {
super.onActivityCreated(bundle);
initializeResources();
initializeListAdapter();
registerForContextMenu(getListView());
}
@Override
public void onCreateContextMenu (ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
android.view.MenuInflater inflater = this.getSherlockActivity().getMenuInflater();
menu.clear();
inflater.inflate(R.menu.conversation_context, menu);
Allow to resend a failed message Add an option to the context menu of the message to resend it if it has failed.
2013-10-13 10:53:41 +00:00
MessageRecord messageRecord = getMessageRecord();
if (messageRecord.isFailed()) {
MenuItem resend = menu.findItem(R.id.menu_context_resend);
resend.setVisible(true);
}
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
}
@Override
public boolean onContextItemSelected(android.view.MenuItem item) {
Allow to resend a failed message Add an option to the context menu of the message to resend it if it has failed.
2013-10-13 10:53:41 +00:00
MessageRecord messageRecord = getMessageRecord();
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
switch(item.getItemId()) {
case R.id.menu_context_copy: handleCopyMessage(messageRecord); return true;
case R.id.menu_context_delete_message: handleDeleteMessage(messageRecord); return true;
case R.id.menu_context_details: handleDisplayDetails(messageRecord); return true;
case R.id.menu_context_forward: handleForwardMessage(messageRecord); return true;
Allow to resend a failed message Add an option to the context menu of the message to resend it if it has failed.
2013-10-13 10:53:41 +00:00
case R.id.menu_context_resend: handleResendMessage(messageRecord); return true;
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
}
return false;
}
Fix success/failure status on conversation item.
2012-08-04 00:34:09 +00:00
@Override
public void onAttach(Activity activity) {
super.onAttach(activity);
this.listener = (ConversationFragmentListener)activity;
}
Allow to resend a failed message Add an option to the context menu of the message to resend it if it has failed.
2013-10-13 10:53:41 +00:00
private MessageRecord getMessageRecord() {
Cursor cursor = ((CursorAdapter)getListAdapter()).getCursor();
ConversationItem conversationItem = (ConversationItem)(((ConversationAdapter)getListAdapter()).newView(getActivity(), cursor, null));
return conversationItem.getMessageRecord();
}
Correctly initialize conversation after message sent.
2012-07-31 23:27:58 +00:00
public void reload(Recipients recipients, long threadId) {
this.recipients = recipients;
this.threadId = threadId;
initializeListAdapter();
}
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
private void handleCopyMessage(MessageRecord message) {
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 19:22:04 +00:00
String body = message.getDisplayBody().toString();
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
if (body == null) return;
ClipboardManager clipboard = (ClipboardManager)getActivity()
.getSystemService(Context.CLIPBOARD_SERVICE);
clipboard.setText(body);
}
Major reorganization of view/model interactions. Mostly, the inheritance graph for MessageRecord/MmsMessageRecord was all messed up, and each class was overloaded for things it shouldn't have been. 1) Broke MessageRecord/MmsMessageRecord up into: DisplayRecord, ThreadRecord, MessageRecord, SmsMessageRecord, NotificationMmsMessageRecord, and MediaMmsMessageRecord. 2) Updated all the adapters/views to keep pace with that change.
2012-10-28 23:04:24 +00:00
private void handleDeleteMessage(final MessageRecord message) {
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
final long messageId = message.getId();
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
Localisation commit You know, it's much more fun listening to you in a lecture theatre. :-P Right; any nit picks now might have to wait 3 weeks, depending on available connectivity. Hope I did not screw this one up.
2012-09-22 19:53:56 +00:00
builder.setTitle(R.string.ConversationFragment_confirm_message_delete);
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
builder.setIcon(android.R.drawable.ic_dialog_alert);
builder.setCancelable(true);
Localisation commit You know, it's much more fun listening to you in a lecture theatre. :-P Right; any nit picks now might have to wait 3 weeks, depending on available connectivity. Hope I did not screw this one up.
2012-09-22 19:53:56 +00:00
builder.setMessage(R.string.ConversationFragment_are_you_sure_you_want_to_permanently_delete_this_message);
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
Major reorganization of view/model interactions. Mostly, the inheritance graph for MessageRecord/MmsMessageRecord was all messed up, and each class was overloaded for things it shouldn't have been. 1) Broke MessageRecord/MmsMessageRecord up into: DisplayRecord, ThreadRecord, MessageRecord, SmsMessageRecord, NotificationMmsMessageRecord, and MediaMmsMessageRecord. 2) Updated all the adapters/views to keep pace with that change.
2012-10-28 23:04:24 +00:00
if (message.isMms()) {
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
DatabaseFactory.getMmsDatabase(getActivity()).delete(messageId);
} else {
DatabaseFactory.getSmsDatabase(getActivity()).deleteMessage(messageId);
}
}
});
builder.setNegativeButton(R.string.no, null);
builder.show();
}
private void handleDisplayDetails(MessageRecord message) {
First cut at group messaging refactor.
2013-04-26 01:59:49 +00:00
String sender = message.getIndividualRecipient().getNumber();
Display both sent and received time in message details. 1) We record time sent in SMS database (date_sent). 2) We record time received in MMS database (date_received). 3) We union this information correctly in MmsSmsDatabase.
2013-01-06 21:13:14 +00:00
long dateReceived = message.getDateReceived();
long dateSent = message.getDateSent();
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
Make 'push' status a type bit on both incoming and outgoing msgs.
2014-02-21 07:00:38 +00:00
String transport;
if (message.isPush()) transport = "push";
else if (message.isMms()) transport = "mms";
else transport = "sms";
ui wip
2014-01-19 02:17:08 +00:00
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
SimpleDateFormat dateFormatter = new SimpleDateFormat("EEE MMM d, yyyy 'at' hh:mm:ss a zzz");
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
Include source origin in string key name. This should help eliminate string duplicates, as well as provide visibility into where strings in a resource file are being used.
2012-09-20 02:56:04 +00:00
builder.setTitle(R.string.ConversationFragment_message_details);
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
builder.setIcon(android.R.drawable.ic_dialog_info);
builder.setCancelable(false);
Display both sent and received time in message details. 1) We record time sent in SMS database (date_sent). 2) We record time received in MMS database (date_received). 3) We union this information correctly in MmsSmsDatabase.
2013-01-06 21:13:14 +00:00
if (dateReceived == dateSent || message.isOutgoing()) {
builder.setMessage(String.format(getSherlockActivity()
.getString(R.string.ConversationFragment_sender_s_transport_s_sent_received_s),
sender, transport.toUpperCase(),
dateFormatter.format(new Date(dateSent))));
} else {
builder.setMessage(String.format(getSherlockActivity()
.getString(R.string.ConversationFragment_sender_s_transport_s_sent_s_received_s),
sender, transport.toUpperCase(),
dateFormatter.format(new Date(dateSent)),
dateFormatter.format(new Date(dateReceived))));
}
Extract TextSecure strings for i18n. 1) Change all instances which use concatenation to build strings with variables in them to use string formatting instead. 2) Extract all string literals from layouts and menus into strings.xml 3) Extract all string literals from code into strings.xml
2012-09-08 03:03:23 +00:00
builder.setPositiveButton(android.R.string.ok, null);
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
builder.show();
}
private void handleForwardMessage(MessageRecord message) {
Intent composeIntent = new Intent(getActivity(), ConversationActivity.class);
Major storage layer refactoring to set the stage for clean GCM. 1) We now try to hand out cursors at a minimum. There has always been a fairly clean insertion layer that handles encrypting message bodies, but the process of decrypting message bodies has always been less than ideal. Here we introduce a "Reader" interface that will decrypt message bodies when appropriate and return objects that encapsulate record state. No more MessageDisplayHelper. The MmsSmsDatabase interface is also more sane. 2) We finally rid ourselves of the technical debt associated with TextSecure's initial usage of the default SMS DB. In that world, we weren't able to use anything other than the default "Inbox, Outbox, Sent" types to describe a message, and had to overload the message content itself with a set of local "prefixes" to describe what it was (encrypted, asymetric encrypted, remote encrypted, a key exchange, procssed key exchange), and so on. This includes a major schema update that transforms the "type" field into a bitmask that describes everything that used to be encoded in a prefix, and prefixes have been completely eliminated from the system. No more Prefix.java 3) Refactoring of the MultipartMessageHandler code. It's less of a mess, and hopefully more clear as to what's going on. The next step is to remove what we can from SmsTransportDetails and genericize that interface for a GCM equivalent.
2013-04-20 19:22:04 +00:00
composeIntent.putExtra("forwarded_message", message.getDisplayBody().toString());
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
composeIntent.putExtra("master_secret", masterSecret);
startActivity(composeIntent);
}
Allow to resend a failed message Add an option to the context menu of the message to resend it if it has failed.
2013-10-13 10:53:41 +00:00
private void handleResendMessage(MessageRecord message) {
long messageId = message.getId();
final Activity activity = getActivity();
MessageSender.resend(activity, messageId, message.isMms());
}
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
private void initializeResources() {
this.masterSecret = (MasterSecret)this.getActivity().getIntent()
.getParcelableExtra("master_secret");
this.recipients = this.getActivity().getIntent().getParcelableExtra("recipients");
this.threadId = this.getActivity().getIntent().getLongExtra("thread_id", -1);
}
private void initializeListAdapter() {
if (this.recipients != null && this.threadId != -1) {
MMS and Group Messaging Improvements 1) Display the individual sender name in a group conversation. 2) Add an "address" column to MmsDatabase and keep FROM there. 3) Remove all blocking operations from MmsDatabase.Reader path. 4) Strip SMIL and other undisplayable parts from part count. 5) Fix places where messages weren't being correctly decrypted.
2013-05-05 19:51:36 +00:00
this.setListAdapter(new ConversationAdapter(getActivity(), masterSecret,
new FailedIconClickHandler(),
group member name tags, group convo iconography, tweaks
2014-02-15 12:21:56 +00:00
(!this.recipients.isSingleRecipient()) || this.recipients.isGroupRecipient()));
Make MMS more asynchronous and consistent with new SMS types. 1) We now delay MMS notifications until a payload is received, or there's an error downloading the payload. This makes group messages more consistent. 2) All "text" parts of an MMS are combined into a second text record, which is stored in the MMS row directly rather than as a distinct part. This allows for immediate text loading, which means there's no chance a ConversationItem will resize. To do this, we need to include MMS in the big DB migration that's already staged for this application update. It's also an "application-level" migration, because we need the MasterSecret to do it. 3) On conversation display, all image-based parts now have their thumbnails loaded asynchronously. This allows for smooth-scrolling. The thumbnails are also scaled more accurately.
2013-04-26 18:23:43 +00:00
getListView().setRecyclerListener((ConversationAdapter)getListAdapter());
Correctly initialize conversation after message sent.
2012-07-31 23:27:58 +00:00
getLoaderManager().initLoader(0, null, this);
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
}
}
@Override
public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
First cut at group messaging refactor.
2013-04-26 01:59:49 +00:00
return new ConversationLoader(getActivity(), threadId);
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
}
@Override
public void onLoadFinished(Loader<Cursor> arg0, Cursor cursor) {
((CursorAdapter)getListAdapter()).changeCursor(cursor);
}
@Override
public void onLoaderReset(Loader<Cursor> arg0) {
((CursorAdapter)getListAdapter()).changeCursor(null);
}
private class FailedIconClickHandler extends Handler {
@Override
public void handleMessage(android.os.Message message) {
Fix success/failure status on conversation item.
2012-08-04 00:34:09 +00:00
if (listener != null) {
listener.setComposeText((String)message.obj);
}
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
}
}
Fix success/failure status on conversation item.
2012-08-04 00:34:09 +00:00
public interface ConversationFragmentListener {
public void setComposeText(String text);
}
New design for Conversation Activity. 1) Move to Fragments for the list view. 2) Switch to CursorLoader from my jankey self-managed cursor. 3) Add session security logic to the ActionBar. 4) Fix colors to be less ugly.
2012-07-19 21:22:03 +00:00
}
Reference in New Issue Copy Permalink