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

Refactor filesharing management

Browse source
This commit is contained in:
Erwan Croze 2018-08-02 13:41:09 +02:00
parent 97db202815
commit 40e5c6872f
2 changed files with 30 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@ import android.os.Handler;
import android.os.Looper;
import android.os.ParcelFileDescriptor;
import android.provider.MediaStore;
import android.provider.OpenableColumns;
import android.telephony.TelephonyManager;
import android.text.Spanned;
import android.text.TextUtils;
@ -598,14 +599,12 @@ public final class LinphoneUtils {
public static String getFilePath(final Context context, final Uri uri) {
if (uri == null) return null;
String result = null;
Cursor returnCursor =
context.getContentResolver().query(uri, null, null, null, null);
String type = getTypeFromUri(uri, context);
returnCursor.moveToFirst();
String result = null;
String name = getNameFromUri(uri, context);
try {
File localFile = createFile(context, null, type);
File localFile = createFile(context, name);
InputStream remoteFile = context.getContentResolver().openInputStream(uri);
if(copyToFile(remoteFile, localFile)) {
@ -620,11 +619,20 @@ public final class LinphoneUtils {
return result;
}
private static String getTypeFromUri(Uri uri, Context context) {
ContentResolver cR = context.getContentResolver();
MimeTypeMap mime = MimeTypeMap.getSingleton();
String type = mime.getExtensionFromMimeType(cR.getType(uri));
return type;
private static String getNameFromUri(Uri uri, Context context) {
String name = null;
if (uri.getScheme().equals("content")) {
Cursor returnCursor = context.getContentResolver().query(uri, null, null, null, null);
if (returnCursor != null) {
returnCursor.moveToFirst();
int nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
name = returnCursor.getString(nameIndex);
returnCursor.close();
}
} else if (uri.getScheme().equals("file")) {
name = uri.getLastPathSegment();
}
return name;
}
/**
@ -658,67 +666,20 @@ public final class LinphoneUtils {
}
}
public static File createFile(Context context, String imageFileName, String type) throws IOException {
if (TextUtils.isEmpty(imageFileName))
imageFileName = getStartDate()+"."+type; // make random filename if you want.
public static File createFile(Context context, String fileName) throws IOException {
if (TextUtils.isEmpty(fileName))
fileName = getStartDate();
if (!fileName.contains(".")) {
fileName = fileName + ".unknown";
}
final File root;
root = context.getExternalCacheDir();
if (root != null && !root.exists())
root.mkdirs();
return new File(root, imageFileName);
}
public static FileInputStream getSourceStream(Context context, Uri u) throws FileNotFoundException {
FileInputStream out = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
ParcelFileDescriptor parcelFileDescriptor =
context.getContentResolver().openFileDescriptor(u, "r");
FileDescriptor fileDescriptor = null;
if (parcelFileDescriptor != null) {
fileDescriptor = parcelFileDescriptor.getFileDescriptor();
out = new FileInputStream(fileDescriptor);
}
} else {
out = (FileInputStream) context.getContentResolver().openInputStream(u);
}
return out;
}
/**
* 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.
*/
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;
return new File(root, fileName);
}
public static String getRealPathFromURI(Context context, Uri contentUri) {
@ -733,32 +694,6 @@ public final class LinphoneUtils {
return null;
}
public static String processContactUri(Context context, Uri contactUri){
ContentResolver cr = context.getContentResolver();
InputStream stream = null;
if(cr !=null) {
try {
stream = cr.openInputStream(contactUri);
} catch (FileNotFoundException e) {
e.printStackTrace();
}
if(stream != null) {
StringBuffer fileContent = new StringBuffer("");
int ch;
try {
while ((ch = stream.read()) != -1)
fileContent.append((char) ch);
} catch (IOException e) {
e.printStackTrace();
}
String data = new String(fileContent);
return data;
}
return null;
}
return null;
}
public static String getContactNameFromVcard(String vcard){
if(vcard != null) {
String contactName = vcard.substring(vcard.indexOf("FN:") + 3);

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

@ -132,14 +132,9 @@ public class LinphoneLauncherActivity extends Activity {
String type = intent.getType();
newIntent.setData(intent.getData());
if (Intent.ACTION_SEND.equals(action) && type != null) {
if (type.contains("text/")){
if(("text/plain").equals(type) && (String)intent.getStringExtra(Intent.EXTRA_TEXT)!= null) {
stringFileShared = intent.getStringExtra(Intent.EXTRA_TEXT);
newIntent.putExtra("msgShared", stringFileShared);
} else if(((Uri) intent.getExtras().get(Intent.EXTRA_STREAM)) != null){
stringFileShared = (LinphoneUtils.createCvsFromString(LinphoneUtils.processContactUri(getApplicationContext(), (Uri)intent.getExtras().get(Intent.EXTRA_STREAM)))).toString();
newIntent.putExtra("fileShared", stringFileShared);
}
if(("text/plain").equals(type) && (String)intent.getStringExtra(Intent.EXTRA_TEXT)!= null) {
stringFileShared = intent.getStringExtra(Intent.EXTRA_TEXT);
newIntent.putExtra("msgShared", stringFileShared);
}else {
fileUri = (Uri) intent.getParcelableExtra(Intent.EXTRA_STREAM);
stringUriFileShared = LinphoneUtils.getFilePath(getBaseContext(), fileUri);