diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc4f1cfc2..4a5a991cd 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="3303" + android:versionName="3.3.0"> + android:versionCode="3303" + android:versionName="3.3.0"> Read Delivered Resend + An error occurs when opening this file. Infos Admin Name your group diff --git a/src/android/org/linphone/activities/LinphoneLauncherActivity.java b/src/android/org/linphone/activities/LinphoneLauncherActivity.java index d263bee35..1dfc4b657 100644 --- a/src/android/org/linphone/activities/LinphoneLauncherActivity.java +++ b/src/android/org/linphone/activities/LinphoneLauncherActivity.java @@ -133,7 +133,7 @@ public class LinphoneLauncherActivity extends Activity { newIntent.setData(intent.getData()); if (Intent.ACTION_SEND.equals(action) && type != null) { if (type.contains("text/")){ - if(("text/plain").equals(type) && intent.getStringExtra(Intent.EXTRA_TEXT)!= null) { + 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){ @@ -141,19 +141,23 @@ public class LinphoneLauncherActivity extends Activity { newIntent.putExtra("fileShared", stringFileShared); } }else { - if(intent.getStringExtra(Intent.EXTRA_STREAM) != null){ + if(((String) intent.getStringExtra(Intent.EXTRA_STREAM)) != null){ 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")) { + 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); } + }else if (Intent.ACTION_SEND_MULTIPLE.equals(action) && type != null) { + if (type.startsWith("image/")) { + //TODO : Manage multiple files sharing + } }else if( ACTION_CALL_LINPHONE.equals(action) && (intent.getStringExtra("NumberToCall") != null)) { String numberToCall = intent.getStringExtra("NumberToCall"); if (CallActivity.isInstanciated()) { diff --git a/src/android/org/linphone/assistant/AssistantActivity.java b/src/android/org/linphone/assistant/AssistantActivity.java index ae06db797..238ac7bdc 100644 --- a/src/android/org/linphone/assistant/AssistantActivity.java +++ b/src/android/org/linphone/assistant/AssistantActivity.java @@ -170,7 +170,7 @@ private static AssistantActivity instance; if (getResources().getBoolean(R.bool.use_phone_number_validation) && cfg.getDomain().equals(getString(R.string.default_domain)) && LinphoneManager.getLc().getDefaultProxyConfig() != null) { - accountCreator.isAccountExist(); + loadAccountCreator(cfg).isAccountExist(); } else { success(); } @@ -226,6 +226,24 @@ private static AssistantActivity instance; status = fragment; } + private AccountCreator loadAccountCreator(ProxyConfig cfg) { + AccountCreator accountCreator = LinphoneManager.getLc().createAccountCreator(LinphonePreferences.instance().getXmlrpcUrl()); + ProxyConfig cfgTab[] = LinphoneManager.getLc().getProxyConfigList(); + accountCreator.setListener(this); + int n = -1; + for (int i = 0 ; i < cfgTab.length ; i++) { + if (cfgTab[i].equals(cfg)) { + n = i; + break; + } + } + if (n >= 0) { + accountCreator.setDomain(mPrefs.getAccountDomain(n)); + accountCreator.setUsername(mPrefs.getAccountUsername(n)); + } + return accountCreator; + } + private void initUI() { back = (ImageView) findViewById(R.id.back); back.setOnClickListener(this); diff --git a/src/android/org/linphone/chat/ChatFragment.java b/src/android/org/linphone/chat/ChatFragment.java index bac380ff4..21d7ad0a6 100644 --- a/src/android/org/linphone/chat/ChatFragment.java +++ b/src/android/org/linphone/chat/ChatFragment.java @@ -768,7 +768,7 @@ public class ChatFragment extends Fragment implements OnClickListener, ChatMessa private void sendImageMessage(String path, int imageSize) { if(path.contains("file://")) { - path = path.substring(7); + path = path.split("file:///", 2)[1]; } if(path.contains("%20")) { path = path.replace("%20", "-"); @@ -801,7 +801,7 @@ public class ChatFragment extends Fragment implements OnClickListener, ChatMessa private void sendFileSharingMessage(String path, int size ) { if (path.contains("file://")) { - path = path.substring(7); + path = path.split("file:///", 2)[1]; } else if (path.contains("com.android.contacts/contacts/")) { path = getCVSPathFromLookupUri(path).toString(); } else if (path.contains("vcard") || path.contains("vcf")) { @@ -1584,20 +1584,29 @@ public class ChatFragment extends Fragment implements OnClickListener, ChatMessa contentUri = Uri.parse(imageUri); } else { file = new File(imageUri); - contentUri = FileProvider.getUriForFile(getActivity(), "org.linphone.provider", file); + try { + contentUri = FileProvider.getUriForFile(getActivity(), "org.linphone.provider", file); + }catch(java.lang.IllegalArgumentException e){ + Log.e("Something wrong happend : "+e); + contentUri = null; + } } String type = null; - String extension = MimeTypeMap.getFileExtensionFromUrl(contentUri.toString()); - if (extension != null) { - type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension); + if(contentUri != null) { + String extension = MimeTypeMap.getFileExtensionFromUrl(contentUri.toString()); + if (extension != null) { + type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension); + } + if (type != null) { + intent.setDataAndType(contentUri, type); + } else { + intent.setDataAndType(contentUri, "*/*"); + } + intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION); + context.startActivity(intent); + }else{ + LinphoneActivity.instance().displayCustomToast(getString(R.string.error_opening_file), Toast.LENGTH_LONG); } - if(type != null) { - intent.setDataAndType(contentUri, type); - }else { - intent.setDataAndType(contentUri, "*/*"); - } - intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION); - context.startActivity(intent); } }); } @@ -1749,20 +1758,29 @@ public class ChatFragment extends Fragment implements OnClickListener, ChatMessa contentUri = Uri.parse(imageUri); } else { file = new File(imageUri); - contentUri = FileProvider.getUriForFile(getActivity(), "org.linphone.provider", file); + try { + contentUri = FileProvider.getUriForFile(getActivity(), "org.linphone.provider", file); + }catch(java.lang.IllegalArgumentException e){ + Log.e("Something wrong happend : "+e); + contentUri = null; + } } String type = null; - String extension = MimeTypeMap.getFileExtensionFromUrl(contentUri.toString()); - if (extension != null) { - type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension); - } - if(type != null) { - intent.setDataAndType(contentUri, type); - }else { - intent.setDataAndType(contentUri, "*/*"); - } - intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION); - context.startActivity(intent); + if(contentUri != null) { + String extension = MimeTypeMap.getFileExtensionFromUrl(contentUri.toString()); + if (extension != null) { + type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension); + } + if (type != null) { + intent.setDataAndType(contentUri, type); + } else { + intent.setDataAndType(contentUri, "*/*"); + } + intent.addFlags(FLAG_GRANT_READ_URI_PERMISSION); + context.startActivity(intent); + }else{ + LinphoneActivity.instance().displayCustomToast(getString(R.string.error_opening_file), Toast.LENGTH_LONG); + } } }); }