Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change filesharing management

Browse source
This commit is contained in:
Erwan Croze 2018-08-02 10:42:52 +02:00
parent 7bbec3271f
commit 04ae3e1194
2 changed files with 20 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
src/android/org/linphone/LinphoneUtils.java
View file

@ -22,9 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import android.app.Activity; import android.app.Activity;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.ContentUris;
import android.content.Context; import android.content.Context;
import android.content.CursorLoader;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
@ -37,7 +35,6 @@ import android.os.Environment;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.provider.DocumentsContract;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.Spanned; import android.text.Spanned;
@ -599,84 +596,30 @@ public final class LinphoneUtils {
} }
/************************************************************************************************
* Picasa/Photos management workaround *
************************************************************************************************/
public static String getFilePath(final Context context, final Uri uri) { public static String getFilePath(final Context context, final Uri uri) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && DocumentsContract.isDocumentUri(context, uri)) { String result = null;
// ExternalStorageProvider Cursor returnCursor =
if ("com.android.externalstorage.documents".equals(uri.getAuthority())) { context.getContentResolver().query(uri, null, null, null, null);
final String docId = DocumentsContract.getDocumentId(uri); String type = getTypeFromUri(uri, context);
final String[] split = docId.split(":");
if (split.length >= 1) return Environment.getExternalStorageDirectory() + "/" + split[1];
// TODO handle non-primary volumes returnCursor.moveToFirst();
}// Docs storage try {
else if ("com.google.android.apps.docs.storage".equals(uri.getAuthority())) { File localFile = createFile(context, null, type);
//Google doc not supported right now InputStream remoteFile = context.getContentResolver().openInputStream(uri);
if(copyToFile(remoteFile, localFile)) {
result = localFile.getAbsolutePath();
} }
// DownloadsProvider
else if ("com.android.providers.downloads.documents".equals(uri.getAuthority())) {
final String id = DocumentsContract.getDocumentId(uri); remoteFile.close();
try { } catch (IOException e) {
final Uri contentUri = ContentUris.withAppendedId( e.printStackTrace();
Uri.parse("content://downloads/public_downloads"), Long.valueOf(id));
return getDataColumn(context, contentUri, null, null);
} catch (NumberFormatException nfe) {
if (id.startsWith("raw:")) {
return id.substring(4);
}
}
}
// MediaProvider
else if ("com.android.providers.media.documents".equals(uri.getAuthority())) {
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);
}
} else if ("content".equalsIgnoreCase(uri.getScheme())) {
String type = getTypeFromUri(uri, context);
String result = getDataColumn(context, uri, null, null); //
if (TextUtils.isEmpty(result))
if (uri.getAuthority().contains("com.google.android") || uri.getAuthority().contains("com.android")) {
try {
File localFile = createFile(context, null, type);
FileInputStream remoteFile = getSourceStream(context, uri);
if(copyToFile(remoteFile, localFile))
result = localFile.getAbsolutePath();
remoteFile.close();
} catch (IOException e) {
e.printStackTrace();
}
}
return result;
} else if ("file".equalsIgnoreCase(uri.getScheme())) { // File
return uri.getPath();
} }
return null;
return result;
} }
private static String getTypeFromUri(Uri uri, Context context) {
private static String getTypeFromUri(Uri uri, Context context){
ContentResolver cR = context.getContentResolver(); ContentResolver cR = context.getContentResolver();
MimeTypeMap mime = MimeTypeMap.getSingleton(); MimeTypeMap mime = MimeTypeMap.getSingleton();
String type = mime.getExtensionFromMimeType(cR.getType(uri)); String type = mime.getExtensionFromMimeType(cR.getType(uri));
@ -719,7 +662,6 @@ public final class LinphoneUtils {
imageFileName = getStartDate()+"."+type; // make random filename if you want. imageFileName = getStartDate()+"."+type; // make random filename if you want.
final File root; final File root;
imageFileName = imageFileName;
root = context.getExternalCacheDir(); root = context.getExternalCacheDir();
if (root != null && !root.exists()) if (root != null && !root.exists())
@ -780,8 +722,7 @@ public final class LinphoneUtils {
public static String getRealPathFromURI(Context context, Uri contentUri) { public static String getRealPathFromURI(Context context, Uri contentUri) {
String[] proj = {MediaStore.Images.Media.DATA}; String[] proj = {MediaStore.Images.Media.DATA};
CursorLoader loader = new CursorLoader(context, contentUri, proj, null, null, null); Cursor cursor = context.getContentResolver().query(contentUri, proj, null, null, null);
Cursor cursor = loader.loadInBackground();
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA); int column_index = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
String result = cursor.getString(column_index); String result = cursor.getString(column_index);
@ -844,7 +785,7 @@ public final class LinphoneUtils {
public static Spanned getTextWithHttpLinks(String text) { public static Spanned getTextWithHttpLinks(String text) {
if (text == null) return null; if (text == null) return null;
if (text.contains("<")) { if (text.contains("<")) {
text = text.replace("<", "&lt;"); text = text.replace("<", "&lt;");
} }

12
src/android/org/linphone/activities/LinphoneLauncherActivity.java
View file

@ -141,17 +141,7 @@ public class LinphoneLauncherActivity extends Activity {
newIntent.putExtra("fileShared", stringFileShared); newIntent.putExtra("fileShared", stringFileShared);
} }
}else { }else {
if(((String) intent.getStringExtra(Intent.EXTRA_STREAM)) != null){ stringUriFileShared = LinphoneUtils.getFilePath(getBaseContext(), fileUri);
stringUriFileShared = intent.getStringExtra(Intent.EXTRA_STREAM);
}else {
fileUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
stringUriFileShared = LinphoneUtils.getRealPathFromURI(getBaseContext(), fileUri);
if(stringUriFileShared == null)
if(fileUri.getPath().contains("/0/1/mediakey:/local") || fileUri.getPath().contains("/ORIGINAL/NONE/")) {
stringUriFileShared = LinphoneUtils.getFilePath(getBaseContext(), fileUri);
}else
stringUriFileShared = fileUri.getPath();
}
newIntent.putExtra("fileShared", stringUriFileShared); newIntent.putExtra("fileShared", stringUriFileShared);
} }
}else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) { }else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {