parent
503d1ef452
commit
53da1f849a
@ -0,0 +1,13 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
|
||||||
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<ImageView android:id="@+id/image"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:contentDescription="@string/media_preview_activity__image_content_description"
|
||||||
|
android:visibility="gone"/>
|
||||||
|
|
||||||
|
</RelativeLayout>
|
@ -0,0 +1,7 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||||
|
<item android:id="@+id/save"
|
||||||
|
android:title="@string/media_preview__save_title"
|
||||||
|
android:icon="@drawable/ic_action_save_holo_dark"
|
||||||
|
android:showAsAction="always"/>
|
||||||
|
</menu>
|
@ -0,0 +1,199 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (C) 2014 Open Whisper Systems
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package org.thoughtcrime.securesms;
|
||||||
|
|
||||||
|
import android.annotation.TargetApi;
|
||||||
|
import android.content.ContentUris;
|
||||||
|
import android.content.DialogInterface;
|
||||||
|
import android.graphics.BitmapFactory;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Build.VERSION;
|
||||||
|
import android.os.Build.VERSION_CODES;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.view.View;
|
||||||
|
import android.view.WindowManager;
|
||||||
|
import android.widget.ImageView;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import com.actionbarsherlock.view.Menu;
|
||||||
|
import com.actionbarsherlock.view.MenuInflater;
|
||||||
|
import com.actionbarsherlock.view.MenuItem;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
||||||
|
import org.thoughtcrime.securesms.providers.PartProvider;
|
||||||
|
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||||
|
import org.thoughtcrime.securesms.util.DateUtils;
|
||||||
|
import org.thoughtcrime.securesms.util.DynamicLanguage;
|
||||||
|
import org.thoughtcrime.securesms.util.DynamicTheme;
|
||||||
|
import org.thoughtcrime.securesms.util.SaveAttachmentTask;
|
||||||
|
import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
|
||||||
|
import org.whispersystems.textsecure.crypto.MasterSecret;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
|
||||||
|
import uk.co.senab.photoview.PhotoViewAttacher;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Activity for displaying media attachments in-app
|
||||||
|
*/
|
||||||
|
public class MediaPreviewActivity extends PassphraseRequiredSherlockActivity {
|
||||||
|
private final static String TAG = MediaPreviewActivity.class.getSimpleName();
|
||||||
|
|
||||||
|
public final static String MASTER_SECRET_EXTRA = "master_secret";
|
||||||
|
public final static String RECIPIENT_EXTRA = "recipient";
|
||||||
|
public final static String DATE_EXTRA = "date";
|
||||||
|
|
||||||
|
private final DynamicTheme dynamicTheme = new DynamicTheme();
|
||||||
|
private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
|
||||||
|
|
||||||
|
private MasterSecret masterSecret;
|
||||||
|
|
||||||
|
private ImageView image;
|
||||||
|
private PhotoViewAttacher imageAttacher;
|
||||||
|
private Uri mediaUri;
|
||||||
|
private String mediaType;
|
||||||
|
private Recipient recipient;
|
||||||
|
private long date;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle bundle) {
|
||||||
|
setFullscreenIfPossible();
|
||||||
|
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
|
||||||
|
WindowManager.LayoutParams.FLAG_FULLSCREEN);
|
||||||
|
dynamicTheme.onCreate(this);
|
||||||
|
dynamicLanguage.onCreate(this);
|
||||||
|
super.onCreate(bundle);
|
||||||
|
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
|
||||||
|
setContentView(R.layout.media_preview_activity);
|
||||||
|
initializeResources();
|
||||||
|
}
|
||||||
|
|
||||||
|
@TargetApi(VERSION_CODES.HONEYCOMB)
|
||||||
|
private void setFullscreenIfPossible() {
|
||||||
|
if (VERSION.SDK_INT >= VERSION_CODES.HONEYCOMB) {
|
||||||
|
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
dynamicTheme.onResume(this);
|
||||||
|
dynamicLanguage.onResume(this);
|
||||||
|
|
||||||
|
masterSecret = getIntent().getParcelableExtra(MASTER_SECRET_EXTRA);
|
||||||
|
|
||||||
|
mediaUri = getIntent().getData();
|
||||||
|
mediaType = getIntent().getType();
|
||||||
|
recipient = getIntent().getParcelableExtra(RECIPIENT_EXTRA);
|
||||||
|
date = getIntent().getLongExtra(DATE_EXTRA, -1);
|
||||||
|
|
||||||
|
final CharSequence relativeTimeSpan;
|
||||||
|
if (date > 0) {
|
||||||
|
relativeTimeSpan = DateUtils.getRelativeTimeSpanString(date,
|
||||||
|
System.currentTimeMillis(),
|
||||||
|
DateUtils.MINUTE_IN_MILLIS);
|
||||||
|
} else {
|
||||||
|
relativeTimeSpan = null;
|
||||||
|
}
|
||||||
|
getSupportActionBar().setTitle(recipient == null ? getString(R.string.MediaPreviewActivity_you) : recipient.getName());
|
||||||
|
getSupportActionBar().setSubtitle(relativeTimeSpan);
|
||||||
|
|
||||||
|
if (!isContentTypeSupported(mediaType)) {
|
||||||
|
Log.w(TAG, "Unsupported media type sent to MediaPreviewActivity, finishing.");
|
||||||
|
Toast.makeText(getApplicationContext(), "Unsupported media type", Toast.LENGTH_LONG).show();
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
Log.w(TAG, "Loading Part URI: " + mediaUri);
|
||||||
|
|
||||||
|
final InputStream is = getInputStream(mediaUri, masterSecret);
|
||||||
|
|
||||||
|
if (mediaType != null && mediaType.startsWith("image/")) {
|
||||||
|
displayImage(is);
|
||||||
|
}
|
||||||
|
} catch (IOException ioe) {
|
||||||
|
Log.w(TAG, ioe);
|
||||||
|
Toast.makeText(getApplicationContext(), "Could not read the media", Toast.LENGTH_LONG).show();
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private InputStream getInputStream(Uri uri, MasterSecret masterSecret) throws IOException {
|
||||||
|
if (PartProvider.isAuthority(uri)) {
|
||||||
|
return DatabaseFactory.getEncryptingPartDatabase(this, masterSecret).getPartStream(ContentUris.parseId(uri));
|
||||||
|
} else {
|
||||||
|
throw new AssertionError("Given a URI that is not handled by our app.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onPause() {
|
||||||
|
super.onPause();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void initializeResources() {
|
||||||
|
image = (ImageView) findViewById(R.id.image);
|
||||||
|
imageAttacher = new PhotoViewAttacher(image);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void displayImage(final InputStream is) {
|
||||||
|
image.setImageBitmap(BitmapFactory.decodeStream(is));
|
||||||
|
image.setVisibility(View.VISIBLE);
|
||||||
|
imageAttacher.update();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void saveToDisk() {
|
||||||
|
SaveAttachmentTask.showWarningDialog(this, new DialogInterface.OnClickListener() {
|
||||||
|
@Override
|
||||||
|
public void onClick(DialogInterface dialogInterface, int i) {
|
||||||
|
SaveAttachmentTask saveTask = new SaveAttachmentTask(MediaPreviewActivity.this, masterSecret);
|
||||||
|
saveTask.execute(new Attachment(mediaUri, mediaType, date));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPrepareOptionsMenu(Menu menu) {
|
||||||
|
super.onPrepareOptionsMenu(menu);
|
||||||
|
|
||||||
|
menu.clear();
|
||||||
|
MenuInflater inflater = this.getSupportMenuInflater();
|
||||||
|
inflater.inflate(R.menu.media_preview, menu);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onOptionsItemSelected(MenuItem item) {
|
||||||
|
super.onOptionsItemSelected(item);
|
||||||
|
|
||||||
|
switch (item.getItemId()) {
|
||||||
|
case R.id.save: saveToDisk(); return true;
|
||||||
|
case android.R.id.home: finish(); return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isContentTypeSupported(final String contentType) {
|
||||||
|
return contentType != null && contentType.startsWith("image/");
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,162 @@
|
|||||||
|
package org.thoughtcrime.securesms.util;
|
||||||
|
|
||||||
|
import android.app.AlertDialog;
|
||||||
|
import android.content.ContentUris;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.content.DialogInterface.OnClickListener;
|
||||||
|
import android.media.MediaScannerConnection;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Environment;
|
||||||
|
import android.util.Log;
|
||||||
|
import android.webkit.MimeTypeMap;
|
||||||
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
import org.thoughtcrime.securesms.R;
|
||||||
|
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
||||||
|
import org.thoughtcrime.securesms.providers.PartProvider;
|
||||||
|
import org.whispersystems.textsecure.crypto.MasterSecret;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.FileOutputStream;
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.OutputStream;
|
||||||
|
import java.lang.ref.WeakReference;
|
||||||
|
import java.text.SimpleDateFormat;
|
||||||
|
|
||||||
|
public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTask.Attachment, Void, Integer> {
|
||||||
|
private static final String TAG = SaveAttachmentTask.class.getSimpleName();
|
||||||
|
|
||||||
|
private static final int SUCCESS = 0;
|
||||||
|
private static final int FAILURE = 1;
|
||||||
|
private static final int WRITE_ACCESS_FAILURE = 2;
|
||||||
|
|
||||||
|
private final WeakReference<Context> contextReference;
|
||||||
|
private final WeakReference<MasterSecret> masterSecretReference;
|
||||||
|
|
||||||
|
public SaveAttachmentTask(Context context, MasterSecret masterSecret) {
|
||||||
|
super(context, R.string.ConversationFragment_saving_attachment, R.string.ConversationFragment_saving_attachment_to_sd_card);
|
||||||
|
this.contextReference = new WeakReference<Context>(context);
|
||||||
|
this.masterSecretReference = new WeakReference<MasterSecret>(masterSecret);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Integer doInBackground(SaveAttachmentTask.Attachment... attachments) {
|
||||||
|
if (attachments == null || attachments.length != 1 || attachments[0] == null) {
|
||||||
|
throw new AssertionError("must pass in exactly one attachment");
|
||||||
|
}
|
||||||
|
Attachment attachment = attachments[0];
|
||||||
|
|
||||||
|
try {
|
||||||
|
Context context = contextReference.get();
|
||||||
|
MasterSecret masterSecret = masterSecretReference.get();
|
||||||
|
|
||||||
|
if (!Environment.getExternalStorageDirectory().canWrite()) {
|
||||||
|
return WRITE_ACCESS_FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (context == null) {
|
||||||
|
return FAILURE;
|
||||||
|
}
|
||||||
|
|
||||||
|
File mediaFile = constructOutputFile(attachment.contentType, attachment.date);
|
||||||
|
InputStream inputStream = DatabaseFactory.getEncryptingPartDatabase(context, masterSecret).getPartStream(ContentUris.parseId(attachment.uri));
|
||||||
|
OutputStream outputStream = new FileOutputStream(mediaFile);
|
||||||
|
|
||||||
|
org.whispersystems.textsecure.util.Util.copy(inputStream, outputStream);
|
||||||
|
|
||||||
|
MediaScannerConnection.scanFile(context, new String[]{mediaFile.getAbsolutePath()},
|
||||||
|
new String[]{attachment.contentType}, null);
|
||||||
|
|
||||||
|
return SUCCESS;
|
||||||
|
} catch (IOException ioe) {
|
||||||
|
Log.w(TAG, ioe);
|
||||||
|
return FAILURE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onPostExecute(Integer result) {
|
||||||
|
super.onPostExecute(result);
|
||||||
|
Context context = contextReference.get();
|
||||||
|
if (context == null) return;
|
||||||
|
|
||||||
|
switch (result) {
|
||||||
|
case FAILURE:
|
||||||
|
Toast.makeText(context, R.string.ConversationFragment_error_while_saving_attachment_to_sd_card,
|
||||||
|
Toast.LENGTH_LONG).show();
|
||||||
|
break;
|
||||||
|
case SUCCESS:
|
||||||
|
Toast.makeText(context, R.string.ConversationFragment_success_exclamation,
|
||||||
|
Toast.LENGTH_LONG).show();
|
||||||
|
break;
|
||||||
|
case WRITE_ACCESS_FAILURE:
|
||||||
|
Toast.makeText(context, R.string.ConversationFragment_unable_to_write_to_sd_card_exclamation,
|
||||||
|
Toast.LENGTH_LONG).show();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private File constructOutputFile(String contentType, long timestamp) throws IOException {
|
||||||
|
File sdCard = Environment.getExternalStorageDirectory();
|
||||||
|
File outputDirectory;
|
||||||
|
|
||||||
|
if (contentType.startsWith("video/")) {
|
||||||
|
outputDirectory = new File(sdCard.getAbsoluteFile() + File.separator + Environment.DIRECTORY_MOVIES);
|
||||||
|
} else if (contentType.startsWith("audio/")) {
|
||||||
|
outputDirectory = new File(sdCard.getAbsolutePath() + File.separator + Environment.DIRECTORY_MUSIC);
|
||||||
|
} else if (contentType.startsWith("image/")) {
|
||||||
|
outputDirectory = new File(sdCard.getAbsolutePath() + File.separator + Environment.DIRECTORY_PICTURES);
|
||||||
|
} else {
|
||||||
|
outputDirectory = new File(sdCard.getAbsolutePath() + File.separator + Environment.DIRECTORY_DOWNLOADS);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!outputDirectory.mkdirs()) Log.w(TAG, "mkdirs() returned false, attempting to continue");
|
||||||
|
|
||||||
|
MimeTypeMap mimeTypeMap = MimeTypeMap.getSingleton();
|
||||||
|
String extension = mimeTypeMap.getExtensionFromMimeType(contentType);
|
||||||
|
SimpleDateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd-HHmmss");
|
||||||
|
String base = "textsecure-" + dateFormatter.format(timestamp);
|
||||||
|
|
||||||
|
if (extension == null)
|
||||||
|
extension = "attach";
|
||||||
|
|
||||||
|
int i = 0;
|
||||||
|
File file = new File(outputDirectory, base + "." + extension);
|
||||||
|
while (file.exists()) {
|
||||||
|
file = new File(outputDirectory, base + "-" + (++i) + "." + extension);
|
||||||
|
}
|
||||||
|
|
||||||
|
return file;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Attachment {
|
||||||
|
public Uri uri;
|
||||||
|
public String contentType;
|
||||||
|
public long date;
|
||||||
|
|
||||||
|
public Attachment(Uri uri, String contentType, long date) {
|
||||||
|
if (uri == null || contentType == null || date < 0) {
|
||||||
|
throw new AssertionError("uri, content type, and date must all be specified");
|
||||||
|
}
|
||||||
|
if (!PartProvider.isAuthority(uri)) {
|
||||||
|
throw new AssertionError("attachment must be a TextSecure attachment");
|
||||||
|
}
|
||||||
|
this.uri = uri;
|
||||||
|
this.contentType = contentType;
|
||||||
|
this.date = date;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void showWarningDialog(Context context, OnClickListener onAcceptListener) {
|
||||||
|
AlertDialog.Builder builder = new AlertDialog.Builder(context);
|
||||||
|
builder.setTitle(R.string.ConversationFragment_save_to_sd_card);
|
||||||
|
builder.setIcon(Dialogs.resolveIcon(context, R.attr.dialog_alert_icon));
|
||||||
|
builder.setCancelable(true);
|
||||||
|
builder.setMessage(R.string.ConversationFragment_this_media_has_been_stored_in_an_encrypted_database_warning);
|
||||||
|
builder.setPositiveButton(R.string.yes, onAcceptListener);
|
||||||
|
builder.setNegativeButton(R.string.no, null);
|
||||||
|
builder.show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue