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

Merge pull request #1339 from mcginty/broken-build

Browse Source 
fix old code breaking build
This commit is contained in:
Moxie Marlinspike 2014-04-11 10:13:05 -07:00
commit c5b3b27c49
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -658,7 +658,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
} }
} }
private class FillExistingGroupInfoAsyncTask extends AsyncTask<Void,Void,Boolean> { private class FillExistingGroupInfoAsyncTask extends AsyncTask<Void,Void,Void> {
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {
@ -671,7 +671,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
} }
@Override @Override
protected Boolean doInBackground(Void... voids) { protected Void doInBackground(Void... voids) {
final GroupDatabase db = DatabaseFactory.getGroupDatabase(GroupCreateActivity.this); final GroupDatabase db = DatabaseFactory.getGroupDatabase(GroupCreateActivity.this);
final Recipients recipients = db.getGroupMembers(groupId, false); final Recipients recipients = db.getGroupMembers(groupId, false);
if (recipients != null) { if (recipients != null) {
@ -690,24 +690,18 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
existingAvatarBmp = BitmapUtil.getCircleCroppedBitmap( existingAvatarBmp = BitmapUtil.getCircleCroppedBitmap(
BitmapFactory.decodeByteArray(existingAvatar, 0, existingAvatar.length)); BitmapFactory.decodeByteArray(existingAvatar, 0, existingAvatar.length));
} }
return true;
} }
return null; return null;
} }
@Override @Override
protected void onPostExecute(Boolean isOwner) { protected void onPostExecute(Void aVoid) {
super.onPostExecute(isOwner); super.onPostExecute(aVoid);
if (pd != null) pd.dismiss(); if (pd != null) pd.dismiss();
if (existingTitle != null) groupName.setText(existingTitle); if (existingTitle != null) groupName.setText(existingTitle);
if (existingAvatarBmp != null) avatar.setImageBitmap(existingAvatarBmp); if (existingAvatarBmp != null) avatar.setImageBitmap(existingAvatarBmp);
if (existingContacts != null) syncAdapterWithSelectedContacts(); if (existingContacts != null) syncAdapterWithSelectedContacts();
if (!isOwner) {
disableWhisperGroupUi(R.string.GroupCreateActivity_you_dont_own_this_group);
getSupportActionBar().setTitle(getString(R.string.GroupCreateActivity_actionbar_update_title)
+ (TextUtils.isEmpty(existingTitle) ? "" : ": " + existingTitle));
}
} }
} }
} }