parent
3677c6ec98
commit
dad90762b4
|
@ -7,6 +7,7 @@ import android.os.PowerManager;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.Pair;
|
import android.util.Pair;
|
||||||
|
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
@ -104,7 +105,13 @@ public class HttpUploadConnection implements Transferable {
|
||||||
mXmppConnectionService.getRNG().nextBytes(this.key);
|
mXmppConnectionService.getRNG().nextBytes(this.key);
|
||||||
this.file.setKeyAndIv(this.key);
|
this.file.setKeyAndIv(this.key);
|
||||||
}
|
}
|
||||||
Pair<InputStream,Integer> pair = AbstractConnectionManager.createInputStream(file,true);
|
Pair<InputStream,Integer> pair;
|
||||||
|
try {
|
||||||
|
pair = AbstractConnectionManager.createInputStream(file, true);
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
fail();
|
||||||
|
return;
|
||||||
|
}
|
||||||
this.file.setExpectedSize(pair.second);
|
this.file.setExpectedSize(pair.second);
|
||||||
this.mFileInputStream = pair.first;
|
this.mFileInputStream = pair.first;
|
||||||
Jid host = account.getXmppConnection().findDiscoItemByFeature(Xmlns.HTTP_UPLOAD);
|
Jid host = account.getXmppConnection().findDiscoItemByFeature(Xmlns.HTTP_UPLOAD);
|
||||||
|
|
|
@ -39,6 +39,7 @@ import eu.siacs.conversations.entities.Transferable;
|
||||||
import eu.siacs.conversations.services.XmppConnectionService;
|
import eu.siacs.conversations.services.XmppConnectionService;
|
||||||
import eu.siacs.conversations.utils.CryptoHelper;
|
import eu.siacs.conversations.utils.CryptoHelper;
|
||||||
import eu.siacs.conversations.utils.ExifHelper;
|
import eu.siacs.conversations.utils.ExifHelper;
|
||||||
|
import eu.siacs.conversations.utils.FileUtils;
|
||||||
import eu.siacs.conversations.xmpp.pep.Avatar;
|
import eu.siacs.conversations.xmpp.pep.Avatar;
|
||||||
|
|
||||||
public class FileBackend {
|
public class FileBackend {
|
||||||
|
@ -126,25 +127,25 @@ public class FileBackend {
|
||||||
return Bitmap.createBitmap(bitmap, 0, 0, w, h, mtx, true);
|
return Bitmap.createBitmap(bitmap, 0, 0, w, h, mtx, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getOriginalPath(Uri uri) {
|
public boolean useImageAsIs(Uri uri) {
|
||||||
String path = null;
|
String path = getOriginalPath(uri);
|
||||||
if (uri.getScheme().equals("file")) {
|
if (path == null) {
|
||||||
return uri.getPath();
|
return false;
|
||||||
} else if (uri.toString().startsWith("content://media/")) {
|
|
||||||
String[] projection = {MediaStore.MediaColumns.DATA};
|
|
||||||
Cursor metaCursor = mXmppConnectionService.getContentResolver().query(uri,
|
|
||||||
projection, null, null, null);
|
|
||||||
if (metaCursor != null) {
|
|
||||||
try {
|
|
||||||
if (metaCursor.moveToFirst()) {
|
|
||||||
path = metaCursor.getString(0);
|
|
||||||
}
|
|
||||||
} finally {
|
|
||||||
metaCursor.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return path;
|
Log.d(Config.LOGTAG,"using image as is. path: "+path);
|
||||||
|
BitmapFactory.Options options = new BitmapFactory.Options();
|
||||||
|
options.inJustDecodeBounds = true;
|
||||||
|
try {
|
||||||
|
BitmapFactory.decodeStream(mXmppConnectionService.getContentResolver().openInputStream(uri), null, options);
|
||||||
|
return (options.outWidth <= Config.IMAGE_SIZE && options.outHeight <= Config.IMAGE_SIZE && options.outMimeType.contains(Config.IMAGE_FORMAT.name().toLowerCase()));
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getOriginalPath(Uri uri) {
|
||||||
|
Log.d(Config.LOGTAG,"get original path for uri: "+uri.toString());
|
||||||
|
return FileUtils.getPath(mXmppConnectionService,uri);
|
||||||
}
|
}
|
||||||
|
|
||||||
public DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
|
public DownloadableFile copyFileToPrivateStorage(Message message, Uri uri) throws FileCopyException {
|
||||||
|
|
|
@ -51,17 +51,13 @@ public class AbstractConnectionManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Pair<InputStream,Integer> createInputStream(DownloadableFile file, boolean gcm) {
|
public static Pair<InputStream,Integer> createInputStream(DownloadableFile file, boolean gcm) throws FileNotFoundException {
|
||||||
FileInputStream is;
|
FileInputStream is;
|
||||||
int size;
|
int size;
|
||||||
try {
|
is = new FileInputStream(file);
|
||||||
is = new FileInputStream(file);
|
size = (int) file.getSize();
|
||||||
size = (int) file.getSize();
|
if (file.getKey() == null) {
|
||||||
if (file.getKey() == null) {
|
return new Pair<InputStream,Integer>(is,size);
|
||||||
return new Pair<InputStream,Integer>(is,size);
|
|
||||||
}
|
|
||||||
} catch (FileNotFoundException e) {
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
if (gcm) {
|
if (gcm) {
|
||||||
|
|
|
@ -404,8 +404,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void attachImageToConversation(final Conversation conversation,
|
public void attachImageToConversation(final Conversation conversation, final Uri uri, final UiCallback<Message> callback) {
|
||||||
final Uri uri, final UiCallback<Message> callback) {
|
if (getFileBackend().useImageAsIs(uri)) {
|
||||||
|
Log.d(Config.LOGTAG,"using image as is");
|
||||||
|
attachFileToConversation(conversation, uri, callback);
|
||||||
|
return;
|
||||||
|
}
|
||||||
final Message message;
|
final Message message;
|
||||||
if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
|
if (conversation.getNextEncryption() == Message.ENCRYPTION_PGP) {
|
||||||
message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
|
message = new Message(conversation, "", Message.ENCRYPTION_DECRYPTED);
|
||||||
|
@ -855,7 +859,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||||
} else {
|
} else {
|
||||||
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetching roster");
|
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": fetching roster");
|
||||||
}
|
}
|
||||||
iqPacket.query(Xmlns.ROSTER).setAttribute("ver",account.getRosterVersion());
|
iqPacket.query(Xmlns.ROSTER).setAttribute("ver", account.getRosterVersion());
|
||||||
sendIqPacket(account,iqPacket,mIqParser);
|
sendIqPacket(account,iqPacket,mIqParser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1000,6 +1004,10 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||||
public void onMessageFound(Message message) {
|
public void onMessageFound(Message message) {
|
||||||
if (!getFileBackend().isFileAvailable(message)) {
|
if (!getFileBackend().isFileAvailable(message)) {
|
||||||
message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
|
message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
|
||||||
|
final int s = message.getStatus();
|
||||||
|
if(s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
|
||||||
|
markMessage(message,Message.STATUS_SEND_FAILED);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -1011,7 +1019,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
|
||||||
if (message != null) {
|
if (message != null) {
|
||||||
if (!getFileBackend().isFileAvailable(message)) {
|
if (!getFileBackend().isFileAvailable(message)) {
|
||||||
message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
|
message.setTransferable(new TransferablePlaceholder(Transferable.STATUS_DELETED));
|
||||||
updateConversationUi();
|
final int s = message.getStatus();
|
||||||
|
if(s == Message.STATUS_WAITING || s == Message.STATUS_OFFERED || s == Message.STATUS_UNSEND) {
|
||||||
|
markMessage(message,Message.STATUS_SEND_FAILED);
|
||||||
|
} else {
|
||||||
|
updateConversationUi();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
144
src/main/java/eu/siacs/conversations/utils/FileUtils.java
Normal file
144
src/main/java/eu/siacs/conversations/utils/FileUtils.java
Normal file
|
@ -0,0 +1,144 @@
|
||||||
|
package eu.siacs.conversations.utils;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
|
import android.content.ContentUris;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.Cursor;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Build;
|
||||||
|
import android.os.Environment;
|
||||||
|
import android.provider.DocumentsContract;
|
||||||
|
import android.provider.MediaStore;
|
||||||
|
|
||||||
|
public class FileUtils {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get a file path from a Uri. This will get the the path for Storage Access
|
||||||
|
* Framework Documents, as well as the _data field for the MediaStore and
|
||||||
|
* other file-based ContentProviders.
|
||||||
|
*
|
||||||
|
* @param context The context.
|
||||||
|
* @param uri The Uri to query.
|
||||||
|
* @author paulburke
|
||||||
|
*/
|
||||||
|
@SuppressLint("NewApi")
|
||||||
|
public static String getPath(final Context context, final Uri uri) {
|
||||||
|
|
||||||
|
final boolean isKitKat = Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
|
||||||
|
|
||||||
|
// DocumentProvider
|
||||||
|
if (isKitKat && DocumentsContract.isDocumentUri(context, uri)) {
|
||||||
|
// ExternalStorageProvider
|
||||||
|
if (isExternalStorageDocument(uri)) {
|
||||||
|
final String docId = DocumentsContract.getDocumentId(uri);
|
||||||
|
final String[] split = docId.split(":");
|
||||||
|
final String type = split[0];
|
||||||
|
|
||||||
|
if ("primary".equalsIgnoreCase(type)) {
|
||||||
|
return Environment.getExternalStorageDirectory() + "/" + split[1];
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO handle non-primary volumes
|
||||||
|
}
|
||||||
|
// DownloadsProvider
|
||||||
|
else if (isDownloadsDocument(uri)) {
|
||||||
|
|
||||||
|
final String id = DocumentsContract.getDocumentId(uri);
|
||||||
|
final Uri contentUri = ContentUris.withAppendedId(
|
||||||
|
Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
|
||||||
|
|
||||||
|
return getDataColumn(context, contentUri, null, null);
|
||||||
|
}
|
||||||
|
// MediaProvider
|
||||||
|
else if (isMediaDocument(uri)) {
|
||||||
|
final String docId = DocumentsContract.getDocumentId(uri);
|
||||||
|
final String[] split = docId.split(":");
|
||||||
|
final String type = split[0];
|
||||||
|
|
||||||
|
Uri contentUri = null;
|
||||||
|
if ("image".equals(type)) {
|
||||||
|
contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
|
||||||
|
} else if ("video".equals(type)) {
|
||||||
|
contentUri = MediaStore.Video.Media.EXTERNAL_CONTENT_URI;
|
||||||
|
} else if ("audio".equals(type)) {
|
||||||
|
contentUri = MediaStore.Audio.Media.EXTERNAL_CONTENT_URI;
|
||||||
|
}
|
||||||
|
|
||||||
|
final String selection = "_id=?";
|
||||||
|
final String[] selectionArgs = new String[]{
|
||||||
|
split[1]
|
||||||
|
};
|
||||||
|
|
||||||
|
return getDataColumn(context, contentUri, selection, selectionArgs);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// MediaStore (and general)
|
||||||
|
else if ("content".equalsIgnoreCase(uri.getScheme())) {
|
||||||
|
return getDataColumn(context, uri, null, null);
|
||||||
|
}
|
||||||
|
// File
|
||||||
|
else if ("file".equalsIgnoreCase(uri.getScheme())) {
|
||||||
|
return uri.getPath();
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the value of the data column for this Uri. This is useful for
|
||||||
|
* MediaStore Uris, and other file-based ContentProviders.
|
||||||
|
*
|
||||||
|
* @param context The context.
|
||||||
|
* @param uri The Uri to query.
|
||||||
|
* @param selection (Optional) Filter used in the query.
|
||||||
|
* @param selectionArgs (Optional) Selection arguments used in the query.
|
||||||
|
* @return The value of the _data column, which is typically a file path.
|
||||||
|
*/
|
||||||
|
public static String getDataColumn(Context context, Uri uri, String selection,
|
||||||
|
String[] selectionArgs) {
|
||||||
|
|
||||||
|
Cursor cursor = null;
|
||||||
|
final String column = "_data";
|
||||||
|
final String[] projection = {
|
||||||
|
column
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
cursor = context.getContentResolver().query(uri, projection, selection, selectionArgs,
|
||||||
|
null);
|
||||||
|
if (cursor != null && cursor.moveToFirst()) {
|
||||||
|
final int column_index = cursor.getColumnIndexOrThrow(column);
|
||||||
|
return cursor.getString(column_index);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
if (cursor != null)
|
||||||
|
cursor.close();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param uri The Uri to check.
|
||||||
|
* @return Whether the Uri authority is ExternalStorageProvider.
|
||||||
|
*/
|
||||||
|
public static boolean isExternalStorageDocument(Uri uri) {
|
||||||
|
return "com.android.externalstorage.documents".equals(uri.getAuthority());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param uri The Uri to check.
|
||||||
|
* @return Whether the Uri authority is DownloadsProvider.
|
||||||
|
*/
|
||||||
|
public static boolean isDownloadsDocument(Uri uri) {
|
||||||
|
return "com.android.providers.downloads.documents".equals(uri.getAuthority());
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param uri The Uri to check.
|
||||||
|
* @return Whether the Uri authority is MediaProvider.
|
||||||
|
*/
|
||||||
|
public static boolean isMediaDocument(Uri uri) {
|
||||||
|
return "com.android.providers.media.documents".equals(uri.getAuthority());
|
||||||
|
}
|
||||||
|
}
|
|
@ -5,6 +5,7 @@ import android.net.Uri;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
import android.util.Pair;
|
import android.util.Pair;
|
||||||
|
|
||||||
|
import java.io.FileNotFoundException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
@ -413,26 +414,31 @@ public class JingleConnection implements Transferable {
|
||||||
content.setTransportId(this.transportId);
|
content.setTransportId(this.transportId);
|
||||||
this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
|
this.file = this.mXmppConnectionService.getFileBackend().getFile(message, false);
|
||||||
Pair<InputStream,Integer> pair;
|
Pair<InputStream,Integer> pair;
|
||||||
if (message.getEncryption() == Message.ENCRYPTION_OTR) {
|
try {
|
||||||
Conversation conversation = this.message.getConversation();
|
if (message.getEncryption() == Message.ENCRYPTION_OTR) {
|
||||||
if (!this.mXmppConnectionService.renewSymmetricKey(conversation)) {
|
Conversation conversation = this.message.getConversation();
|
||||||
Log.d(Config.LOGTAG,account.getJid().toBareJid()+": could not set symmetric key");
|
if (!this.mXmppConnectionService.renewSymmetricKey(conversation)) {
|
||||||
cancel();
|
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": could not set symmetric key");
|
||||||
|
cancel();
|
||||||
|
}
|
||||||
|
this.file.setKeyAndIv(conversation.getSymmetricKey());
|
||||||
|
pair = AbstractConnectionManager.createInputStream(this.file, false);
|
||||||
|
this.file.setExpectedSize(pair.second);
|
||||||
|
content.setFileOffer(this.file, true);
|
||||||
|
} else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
|
||||||
|
this.file.setKey(mXmppAxolotlMessage.getInnerKey());
|
||||||
|
this.file.setIv(mXmppAxolotlMessage.getIV());
|
||||||
|
pair = AbstractConnectionManager.createInputStream(this.file, true);
|
||||||
|
this.file.setExpectedSize(pair.second);
|
||||||
|
content.setFileOffer(this.file, false).addChild(mXmppAxolotlMessage.toElement());
|
||||||
|
} else {
|
||||||
|
pair = AbstractConnectionManager.createInputStream(this.file, false);
|
||||||
|
this.file.setExpectedSize(pair.second);
|
||||||
|
content.setFileOffer(this.file, false);
|
||||||
}
|
}
|
||||||
this.file.setKeyAndIv(conversation.getSymmetricKey());
|
} catch (FileNotFoundException e) {
|
||||||
pair = AbstractConnectionManager.createInputStream(this.file,false);
|
cancel();
|
||||||
this.file.setExpectedSize(pair.second);
|
return;
|
||||||
content.setFileOffer(this.file, true);
|
|
||||||
} else if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) {
|
|
||||||
this.file.setKey(mXmppAxolotlMessage.getInnerKey());
|
|
||||||
this.file.setIv(mXmppAxolotlMessage.getIV());
|
|
||||||
pair = AbstractConnectionManager.createInputStream(this.file,true);
|
|
||||||
this.file.setExpectedSize(pair.second);
|
|
||||||
content.setFileOffer(this.file, false).addChild(mXmppAxolotlMessage.toElement());
|
|
||||||
} else {
|
|
||||||
pair = AbstractConnectionManager.createInputStream(this.file,false);
|
|
||||||
this.file.setExpectedSize(pair.second);
|
|
||||||
content.setFileOffer(this.file, false);
|
|
||||||
}
|
}
|
||||||
this.mFileInputStream = pair.first;
|
this.mFileInputStream = pair.first;
|
||||||
this.transportId = this.mJingleConnectionManager.nextRandomId();
|
this.transportId = this.mJingleConnectionManager.nextRandomId();
|
||||||
|
|
Loading…
Reference in a new issue