TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 08:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for tiling image view and large image viewing

Browse Source 
Fixes #5949
Fixes #5574
Fixes #4380
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2016-12-14 10:21:14 -08:00
parent 477589b092
commit d2be49af42
12 changed files with 335 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/org/thoughtcrime/securesms/MediaPreviewActivity.java
View File

@@ -61,14 +61,15 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
private MasterSecret masterSecret;
private ZoomingImageView image;
private VideoPlayer video;
private Uri mediaUri;
private String mediaType;
private Recipient recipient;
private long threadId;
private long date;
private long size;
private ZoomingImageView image;
private VideoPlayer video;
private Uri mediaUri;
private String mediaType;
private Recipient recipient;
private long threadId;
private long date;
private long size;
@Override
protected void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
@@ -137,8 +138,8 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
}
private void initializeViews() {
image = (ZoomingImageView)findViewById(R.id.image);
video = (VideoPlayer)findViewById(R.id.video_player);
image = (ZoomingImageView) findViewById(R.id.image);
video = (VideoPlayer) findViewById(R.id.video_player);
}
private void initializeResources() {
@@ -171,7 +172,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
if (mediaType != null && mediaType.startsWith("image/")) {
image.setVisibility(View.VISIBLE);
video.setVisibility(View.GONE);
image.setImageUri(masterSecret, mediaUri);
image.setImageUri(masterSecret, mediaUri, mediaType);
} else if (mediaType != null && mediaType.startsWith("video/")) {
image.setVisibility(View.GONE);
video.setVisibility(View.VISIBLE);
@@ -185,7 +186,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity im
}
private void cleanupMedia() {
image.setImageDrawable(null);
image.cleanup();
video.cleanup();
}