Skip to content

Commit 947f377

Browse files
committed
removed duplicate code
1 parent 16603f1 commit 947f377

File tree

4 files changed

+4
-18
lines changed

4 files changed

+4
-18
lines changed

app/src/main/java/co/tinode/tindroid/CreateGroupFragment.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
* Fragment for adding/editing a group topic
4343
*/
4444
public class CreateGroupFragment extends Fragment implements UiUtils.AvatarPreviewer {
45-
46-
private static final String TAG = "CreateGroupFragment";
4745
private static final int LOADER_ID = 102;
4846

4947
private PromisedReply.FailureListener<ServerMessage> mFailureListener;
@@ -222,10 +220,10 @@ private void createTopic(final Activity activity, final String title, final Bitm
222220
AttachmentHandler.uploadAvatar(topic.getPub(), avatar, null)
223221
.thenApply(new PromisedReply.SuccessListener<ServerMessage>() {
224222
@Override
225-
public PromisedReply<ServerMessage> onSuccess(ServerMessage result) {
223+
public PromisedReply<ServerMessage> onSuccess(ServerMessage unused) {
226224
return topic.subscribe().thenApply(new PromisedReply.SuccessListener<ServerMessage>() {
227225
@Override
228-
public PromisedReply<ServerMessage> onSuccess(ServerMessage result) {
226+
public PromisedReply<ServerMessage> onSuccess(ServerMessage unused) {
229227
for (String user : members) {
230228
topic.invite(user, null /* use default */);
231229
}

app/src/main/java/co/tinode/tindroid/SignUpFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public PromisedReply<ServerMessage> onSuccess(ServerMessage ignored_msg) {
184184
public PromisedReply<ServerMessage> onSuccess(ServerMessage ignored_msg) {
185185
// Try to create a new account.
186186
MetaSetDesc<VxCard, String> meta = new MetaSetDesc<>(theCard, null);
187-
meta.attachments = theCard.getPhotoAttachment();
187+
meta.attachments = theCard.getPhotoRefs();
188188
return tinode.createAccountBasic(
189189
login, password, true, null, meta,
190190
Credential.append(null, new Credential("email", email)));

app/src/main/java/co/tinode/tindroid/media/VxCard.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,6 @@ public void constructBitmap() {
9191
}
9292
}
9393

94-
/**
95-
* If Photo is an external reference, return it as a string array with one element.
96-
* @return photo URL or null of photo does not exist or is not a reference.
97-
*/
98-
@JsonIgnore
99-
public String[] getPhotoAttachment() {
100-
if (photo != null && photo.ref != null) {
101-
return new String[] { photo.ref };
102-
}
103-
return null;
104-
}
105-
10694
private static Photo serializeBitmap(Bitmap bmp) {
10795
if (bmp != null) {
10896
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();

tinodesdk/src/main/java/co/tinode/tinodesdk/ComTopic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public ComTopic(Tinode tinode, Listener l, boolean isChannel) {
4040
public PromisedReply<ServerMessage> subscribe() {
4141
if (isNew()) {
4242
MetaSetDesc<DP, PrivateType> desc = new MetaSetDesc<>(mDesc.pub, mDesc.priv);
43-
if (mDesc.pub != null && mDesc.pub.isPhotoRef()) {
43+
if (mDesc.pub != null) {
4444
desc.attachments = mDesc.pub.getPhotoRefs();
4545
}
4646
return subscribe(new MsgSetMeta<>(desc, null, mTags, null), null);

0 commit comments

Comments
 (0)