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

[Presenc] update avatar icon

Browse source
This commit is contained in:
Brieuc Viel 2016-04-28 16:12:16 +02:00
parent baa446103b
commit 614c6022cf
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/org/linphone/LinphoneManager.java
View file

@ -598,7 +598,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
e.printStackTrace();
}
finally {
mServiceContext.unregisterReceiver(instance.mKeepAliveReceiver);
mServiceContext.unregisterReceiver(instance.mKeepAliveReceiver);
mLc = null;
}
}

14
src/org/linphone/ui/AvatarWithPresenceImage.java
View file

@ -12,6 +12,7 @@ import org.linphone.LinphoneManager;
import org.linphone.R;
import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneFriend;
import org.linphone.core.LinphoneFriendList;
import org.linphone.core.OnlineStatus;
import org.linphone.core.PresenceActivity;
import org.linphone.core.PresenceActivityType;
@ -106,8 +107,13 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
PresenceModel presenceModel = contact.getFriendPresenceModel();
PresenceBasicStatus basicStatus = presenceModel.getBasicStatus();
if (basicStatus == PresenceBasicStatus.Closed) {
friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
friendStatusBig.setImageResource(R.drawable.presence_unregistered);
if(friend.getPresenceModel() != null){
friendStatusSmall.setImageResource(R.drawable.presence_away);
friendStatusBig.setImageResource(R.drawable.presence_away);
}else {
friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
friendStatusBig.setImageResource(R.drawable.presence_unregistered);
}
} else if ((presenceModel.getActivity().getType() == PresenceActivityType.TV )) {
friendStatusSmall.setImageResource(R.drawable.presence_online);
friendStatusBig.setImageResource(R.drawable.presence_online);
@ -119,10 +125,10 @@ public class AvatarWithPresenceImage extends RelativeLayout implements onPresenc
friendStatusSmall.setImageResource(R.drawable.presence_away);
friendStatusBig.setImageResource(R.drawable.presence_away);
*/
} else{
}/* else{
friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
friendStatusSmall.setImageResource(R.drawable.presence_unregistered);
}
}*/
}
}
}

2
submodules/linphone

@ -1 +1 @@
Subproject commit bc80229ec26b5da6f318096a2f79bf9c4c281318
Subproject commit f10471de2e2316958ccce54a2dbcde41cd9bb05f