TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for MediaOverviewActivity NPE

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-08-01 10:00:55 -07:00
parent 5f9a3b7930
commit abea2d0bdf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/org/thoughtcrime/securesms/MediaOverviewActivity.java
View File

@ -24,6 +24,7 @@ import android.database.Cursor;
import android.os.Build.VERSION; import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES; import android.os.Build.VERSION_CODES;
import android.os.Bundle; import android.os.Bundle;
import android.os.Parcelable;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v4.app.LoaderManager; import android.support.v4.app.LoaderManager;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
@ -132,10 +133,10 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity i
gridView.setLayoutManager(gridManager); gridView.setLayoutManager(gridManager);
gridView.setHasFixedSize(true); gridView.setHasFixedSize(true);
Address[] addresses = Address.fromParcelable(getIntent().getParcelableArrayExtra(ADDRESSES_EXTRA)); Parcelable[] parcelables = getIntent().getParcelableArrayExtra(ADDRESSES_EXTRA);
if (addresses != null) { if (parcelables != null) {
recipients = RecipientFactory.getRecipientsFor(this, addresses, true); recipients = RecipientFactory.getRecipientsFor(this, Address.fromParcelable(parcelables), true);
} else if (threadId > -1) { } else if (threadId > -1) {
recipients = DatabaseFactory.getThreadDatabase(this).getRecipientsForThreadId(threadId); recipients = DatabaseFactory.getThreadDatabase(this).getRecipientsForThreadId(threadId);
} else { } else {