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

Removed hard coded provider

Browse source
This commit is contained in:
Mickaël Turnel 2018-10-09 10:51:29 +02:00
parent da0782d213
commit 46bfdb54b3
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
res/values/non_localizable_custom.xml
View file

@ -3,7 +3,8 @@
<!-- Global --> <!-- Global -->
<string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses --> <string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses -->
<string name="default_conference_factory_uri">sip:conference-factory@sip.linphone.org</string> <string name="default_conference_factory_uri">sip:conference-factory@sip.linphone.org</string>
<string name="file_provider">org.linphone.provider</string>
<string name="sync_account_type">org.linphone</string> <!-- Change package ! --> <string name="sync_account_type">org.linphone</string> <!-- Change package ! -->
<string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! --> <string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! -->
<string name="rls_uri">sip:rls@sip.linphone.org</string> <string name="rls_uri">sip:rls@sip.linphone.org</string>

4
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -489,13 +489,13 @@ public class ChatEventsAdapter extends SelectableAdapter<ChatBubbleViewHolder> {
if (path.startsWith("file://")) { if (path.startsWith("file://")) {
path = path.substring("file://".length()); path = path.substring("file://".length());
file = new File(path); file = new File(path);
contentUri = FileProvider.getUriForFile(mContext, "org.linphone.provider", file); contentUri = FileProvider.getUriForFile(mContext, mContext.getResources().getString(R.string.file_provider), file);
} else if (path.startsWith("content://")) { } else if (path.startsWith("content://")) {
contentUri = Uri.parse(path); contentUri = Uri.parse(path);
} else { } else {
file = new File(path); file = new File(path);
try { try {
contentUri = FileProvider.getUriForFile(mContext, "org.linphone.provider", file); contentUri = FileProvider.getUriForFile(mContext, mContext.getResources().getString(R.string.file_provider), file);
} catch (Exception e) { } catch (Exception e) {
contentUri = Uri.parse(path); contentUri = Uri.parse(path);
} }