Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-01 06:03:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

More MasterSecret cleanup

Browse Source
This commit is contained in:
Moxie Marlinspike
2018-02-01 19:22:48 -08:00
parent 59092e2ec0
commit 3633d805c8
52 changed files with 228 additions and 725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,6 @@ import android.widget.TextView;
import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
import org.thoughtcrime.securesms.database.loaders.BucketedThreadMediaLoader;
@@ -71,7 +70,6 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
private Toolbar toolbar;
private TabLayout tabLayout;
private ViewPager viewPager;
private MasterSecret masterSecret;
private Recipient recipient;
@Override
@@ -81,9 +79,8 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
}
@Override
protected void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
protected void onCreate(Bundle bundle, boolean ready) {
setContentView(R.layout.media_overview_activity);
this.masterSecret = masterSecret;
initializeResources();
initializeToolbar();
@@ -142,7 +139,6 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
Bundle args = new Bundle();
args.putString(MediaOverviewGalleryFragment.ADDRESS_EXTRA, recipient.getAddress().serialize());
args.putParcelable(MediaOverviewGalleryFragment.MASTER_SECRET_EXTRA, masterSecret);
args.putSerializable(MediaOverviewGalleryFragment.LOCALE_EXTRA, dynamicLanguage.getCurrentLocale());
fragment.setArguments(args);
@@ -165,13 +161,11 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
public static abstract class MediaOverviewFragment<T> extends Fragment implements LoaderManager.LoaderCallbacks<T> {
public static final String ADDRESS_EXTRA = "address";
public static final String MASTER_SECRET_EXTRA = "master_secret";
public static final String LOCALE_EXTRA = "locale_extra";
public static final String ADDRESS_EXTRA = "address";
public static final String LOCALE_EXTRA = "locale_extra";
protected TextView noMedia;
protected Recipient recipient;
protected MasterSecret masterSecret;
protected RecyclerView recyclerView;
protected Locale locale;
@@ -180,15 +174,12 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
super.onCreate(bundle);
String address = getArguments().getString(ADDRESS_EXTRA);
MasterSecret masterSecret = getArguments().getParcelable(MASTER_SECRET_EXTRA);
Locale locale = (Locale)getArguments().getSerializable(LOCALE_EXTRA);
if (address == null) throw new AssertionError();
if (masterSecret == null) throw new AssertionError();
if (locale == null) throw new AssertionError();
this.recipient = Recipient.from(getContext(), Address.fromSerialized(address), true);
this.masterSecret = masterSecret;
this.locale = locale;
getLoaderManager().initLoader(0, null, this);
@@ -263,7 +254,7 @@ public class MediaOverviewActivity extends PassphraseRequiredActionBarActivity
@Override
public Loader<Cursor> onCreateLoader(int id, Bundle args) {
return new ThreadMediaLoader(getContext(), masterSecret, recipient.getAddress(), false);
return new ThreadMediaLoader(getContext(), recipient.getAddress(), false);
}
@Override