From ccb0cc6baf3a63be5d1cebf0eadf5b416d6831ab Mon Sep 17 00:00:00 2001 From: Jake McGinty Date: Fri, 11 Apr 2014 10:00:30 -0700 Subject: [PATCH] fix old code breaking build // FREEBIE --- .../securesms/GroupCreateActivity.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java index ad1b09d45..ebd8ded7a 100644 --- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java +++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java @@ -658,7 +658,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv } } - private class FillExistingGroupInfoAsyncTask extends AsyncTask { + private class FillExistingGroupInfoAsyncTask extends AsyncTask { @Override protected void onPreExecute() { @@ -671,7 +671,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv } @Override - protected Boolean doInBackground(Void... voids) { + protected Void doInBackground(Void... voids) { final GroupDatabase db = DatabaseFactory.getGroupDatabase(GroupCreateActivity.this); final Recipients recipients = db.getGroupMembers(groupId, false); if (recipients != null) { @@ -690,24 +690,18 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv existingAvatarBmp = BitmapUtil.getCircleCroppedBitmap( BitmapFactory.decodeByteArray(existingAvatar, 0, existingAvatar.length)); } - return true; } return null; } @Override - protected void onPostExecute(Boolean isOwner) { - super.onPostExecute(isOwner); + protected void onPostExecute(Void aVoid) { + super.onPostExecute(aVoid); if (pd != null) pd.dismiss(); if (existingTitle != null) groupName.setText(existingTitle); if (existingAvatarBmp != null) avatar.setImageBitmap(existingAvatarBmp); 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)); - } } } }