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

MMS should open conversation also

Browse Source
This commit is contained in:
Jake McGinty 2014-02-17 20:19:54 -08:00
parent ca51ddac7f
commit 54b087c458
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/org/thoughtcrime/securesms/GroupCreateActivity.java
View File

@ -407,18 +407,33 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
return results; return results;
} }
private class CreateMmsGroupAsyncTask extends AsyncTask<Void,Void,Void> { private class CreateMmsGroupAsyncTask extends AsyncTask<Void,Void,Long> {
@Override @Override
protected Void doInBackground(Void... voids) { protected Long doInBackground(Void... voids) {
handleCreateMmsGroup(selectedContacts); handleCreateMmsGroup(selectedContacts);
return null; return null;
} }
@Override @Override
protected void onPostExecute(Void aVoid) { protected void onPostExecute(Long resultThread) {
super.onPostExecute(aVoid); if (resultThread > -1) {
finish(); Intent intent = new Intent(GroupCreateActivity.this, ConversationActivity.class);
intent.putExtra(ConversationActivity.MASTER_SECRET_EXTRA, masterSecret);
intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, resultThread.longValue());
intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
ArrayList<Recipient> selectedContactsList = new ArrayList<Recipient>(selectedContacts.size());
for (Recipient recipient : selectedContacts) {
selectedContactsList.add(recipient);
}
intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, new Recipients(selectedContactsList));
startActivity(intent);
finish();
} else {
Toast.makeText(getApplicationContext(), R.string.GroupCreateActivity_contacts_mms_exception, Toast.LENGTH_LONG).show();
finish();
}
} }
@Override @Override
@ -433,20 +448,21 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
@Override @Override
protected Long doInBackground(Void... voids) { protected Long doInBackground(Void... voids) {
byte[] byteArray = null; byte[] avatarBytes = null;
if (avatarBmp != null) { if (avatarBmp != null) {
ByteArrayOutputStream stream = new ByteArrayOutputStream(); ByteArrayOutputStream stream = new ByteArrayOutputStream();
avatarBmp.compress(Bitmap.CompressFormat.PNG, 100, stream); avatarBmp.compress(Bitmap.CompressFormat.PNG, 100, stream);
byteArray = stream.toByteArray(); avatarBytes = stream.toByteArray();
} }
final String name = (groupName.getText() != null) ? groupName.getText().toString() : null;
try { try {
return Long.valueOf(handleCreatePushGroup(groupName.getText().toString(), byteArray, selectedContacts)); return handleCreatePushGroup(name, avatarBytes, selectedContacts);
} catch (MmsException e) { } catch (MmsException e) {
Log.w("GroupCreateActivity", e); Log.w("GroupCreateActivity", e);
return Long.valueOf(RES_MMS_EXCEPTION); return RES_MMS_EXCEPTION;
} catch (InvalidNumberException e) { } catch (InvalidNumberException e) {
Log.w("GroupCreateActivity", e); Log.w("GroupCreateActivity", e);
return Long.valueOf(RES_BAD_NUMBER); return RES_BAD_NUMBER;
} }
} }