mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-18 03:48:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some fix + update version

Browse source
This commit is contained in:
Erwan Croze 2018-07-25 14:10:31 +02:00
parent a33532f512
commit b065907f35
6 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
AndroidManifest.xml
View file

@ -2,8 +2,8 @@
<manifest package="org.linphone"
xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto"
android:versionCode="1400"
android:versionName="1.4.0">
android:versionCode="1410"
android:versionName="1.4.1">
<uses-sdk
android:minSdkVersion="16"

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

@ -913,9 +913,11 @@ public final class LinphoneUtils {
if (ourUri == null || sipUri == null) return ChatRoomSecurityLevel.ClearText;
for (ChatRoom cr : lc.getChatRooms()) {
for (Participant pa : cr.getParticipants()) {
if (pa.getAddress() != null && pa.getAddress().asStringUriOnly().compareTo(sipUri.asStringUriOnly()) == 0) {
return pa.getSecurityLevel();
if (cr != null && cr.getParticipants() != null) {
for (Participant pa : cr.getParticipants()) {
if (pa.getAddress() != null && pa.getAddress().asStringUriOnly().compareTo(sipUri.asStringUriOnly()) == 0) {
return pa.getSecurityLevel();
}
}
}
}

2
src/android/org/linphone/chat/GroupChatFragment.java
View file

@ -228,6 +228,8 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
fileSharedUri = LinphoneUtils.getFilePath(this.getActivity().getApplicationContext(), Uri.parse(fileSharedUri));
} else if (fileSharedUri.contains("com.android.contacts/contacts/")) {
fileSharedUri = LinphoneUtils.getCVSPathFromLookupUri(fileSharedUri).toString();
} else {
fileSharedUri = LinphoneUtils.getFilePath(this.getActivity().getApplicationContext(), Uri.parse(fileSharedUri));
}
addFileToPendingList(fileSharedUri);
}

2
src/android/org/linphone/contacts/ContactsListFragment.java
View file

@ -92,8 +92,6 @@ public class ContactsListFragment extends Fragment implements OnClickListener, O
onlyDisplayChatAddress = getArguments().getBoolean("ChatAddressOnly");
}
FriendList test[] = LinphoneManager.getLc().getFriendsLists();
noSipContact = (TextView) view.findViewById(R.id.noSipContact);
noContact = (TextView) view.findViewById(R.id.noContact);

2
src/android/org/linphone/fragments/HistoryListFragment.java
View file

@ -506,6 +506,8 @@ public class HistoryListFragment extends Fragment implements OnClickListener, On
holder.contactPicture.setImageResource(R.drawable.avatar_medium_unregistered);
}
displayName = c.getFullName();
if (displayName == null) {
holder.contact.setText(LinphoneUtils.getAddressDisplayName(sipUri));
} else {

2
submodules/linphone

@ -1 +1 @@
Subproject commit bdf6f37b10a9d8a8fe040a28816ac8c9374bd601
Subproject commit c9601870b236ee5090c2e38492ab70af84850163