TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 20:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for crash when opening group conversation

Browse Source 
Fixes #6464
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-03-31 16:52:50 -07:00
parent d85ddbcd10
commit b0bd6ad729
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/ConversationItem.java
View File

@ -27,7 +27,6 @@ import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AlertDialog; import android.support.v7.app.AlertDialog;
import android.text.TextUtils; import android.text.TextUtils;
import android.text.util.Linkify; import android.text.util.Linkify;
@ -339,7 +338,7 @@ public class ConversationItem extends LinearLayout
documentViewStub.get().setDownloadClickListener(downloadClickListener); documentViewStub.get().setDownloadClickListener(downloadClickListener);
documentViewStub.get().setOnLongClickListener(passthroughClickListener); documentViewStub.get().setOnLongClickListener(passthroughClickListener);
bodyText.setLayoutParams(new ActionBar.LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); bodyText.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
} else if (hasThumbnail(messageRecord)) { } else if (hasThumbnail(messageRecord)) {
mediaThumbnailStub.get().setVisibility(View.VISIBLE); mediaThumbnailStub.get().setVisibility(View.VISIBLE);
if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE); if (audioViewStub.resolved()) audioViewStub.get().setVisibility(View.GONE);

2
src/org/thoughtcrime/securesms/util/MediaUtil.java
View File

@ -83,7 +83,7 @@ public class MediaUtil {
slide = new AudioSlide(context, attachment); slide = new AudioSlide(context, attachment);
} else if (isMms(attachment.getContentType())) { } else if (isMms(attachment.getContentType())) {
slide = new MmsSlide(context, attachment); slide = new MmsSlide(context, attachment);
} else { } else if (attachment.getContentType() != null) {
slide = new DocumentSlide(context, attachment); slide = new DocumentSlide(context, attachment);
} }