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

Allow multiple image sharing through linphone

Browse source
This commit is contained in:
Sylvain Berfini 2019-02-19 16:12:18 +01:00
parent cb34afab14
commit 3a1a1f7102
3 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/AndroidManifest.xml
View file

@ -109,6 +109,14 @@
<data android:mimeType="video/*" /> <data android:mimeType="video/*" />
<data android:mimeType="application/*" /> <data android:mimeType="application/*" />
</intent-filter> </intent-filter>
<intent-filter>
<action android:name="android.intent.action.SEND_MULTIPLE" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.OPENABLE" />
<data android:mimeType="image/*" />
</intent-filter>
<intent-filter> <intent-filter>
<action android:name="org.linphone.intent.action.CallLaunched" /> <action android:name="org.linphone.intent.action.CallLaunched" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />

10
app/src/main/java/org/linphone/LinphoneLauncherActivity.java
View file

@ -28,6 +28,7 @@ import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.util.Log; import android.util.Log;
import java.util.ArrayList;
import org.linphone.assistant.RemoteProvisioningActivity; import org.linphone.assistant.RemoteProvisioningActivity;
import org.linphone.call.CallActivity; import org.linphone.call.CallActivity;
import org.linphone.contacts.ContactsManager; import org.linphone.contacts.ContactsManager;
@ -129,7 +130,14 @@ public class LinphoneLauncherActivity extends Activity {
} }
} else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) { } else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) {
if (type.startsWith("image/")) { if (type.startsWith("image/")) {
// TODO : Manage multiple files sharing ArrayList<Uri> imageUris =
intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
String filePaths = "";
for (Uri uri : imageUris) {
filePaths += FileUtils.getFilePath(getBaseContext(), uri);
filePaths += ":";
}
newIntent.putExtra("fileShared", filePaths);
} }
} else if (ACTION_CALL_LINPHONE.equals(action) } else if (ACTION_CALL_LINPHONE.equals(action)
&& (intent.getStringExtra("NumberToCall") != null)) { && (intent.getStringExtra("NumberToCall") != null)) {

33
app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
View file

@ -316,19 +316,13 @@ public class ChatMessagesFragment extends Fragment
if (getArguments() != null) { if (getArguments() != null) {
String fileSharedUri = getArguments().getString("fileSharedUri"); String fileSharedUri = getArguments().getString("fileSharedUri");
if (fileSharedUri != null) { if (fileSharedUri != null) {
if (FileUtils.isExtensionImage(fileSharedUri)) { if (fileSharedUri.contains(":")) {
addImageToPendingList(fileSharedUri); String[] files = fileSharedUri.split(":");
} else { for (String file : files) {
if (fileSharedUri.startsWith("content://") addFileIntoSharingArea(file);
|| fileSharedUri.startsWith("file://")) {
fileSharedUri =
FileUtils.getFilePath(
getActivity().getApplicationContext(),
Uri.parse(fileSharedUri));
} else if (fileSharedUri.contains("com.android.contacts/contacts/")) {
fileSharedUri = FileUtils.getCVSPathFromLookupUri(fileSharedUri).toString();
} }
addFileToPendingList(fileSharedUri); } else {
addFileIntoSharingArea(fileSharedUri);
} }
} }
@ -580,6 +574,21 @@ public class ChatMessagesFragment extends Fragment
return super.onContextItemSelected(item); return super.onContextItemSelected(item);
} }
private void addFileIntoSharingArea(String fileSharedUri) {
if (FileUtils.isExtensionImage(fileSharedUri)) {
addImageToPendingList(fileSharedUri);
} else {
if (fileSharedUri.startsWith("content://") || fileSharedUri.startsWith("file://")) {
fileSharedUri =
FileUtils.getFilePath(
getActivity().getApplicationContext(), Uri.parse(fileSharedUri));
} else if (fileSharedUri.contains("com.android.contacts/contacts/")) {
fileSharedUri = FileUtils.getCVSPathFromLookupUri(fileSharedUri).toString();
}
addFileToPendingList(fileSharedUri);
}
}
private void loadMoreData(final int totalItemsCount) { private void loadMoreData(final int totalItemsCount) {
mHandler.post( mHandler.post(
new Runnable() { new Runnable() {