Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5e713ba authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Phone will auto reboot when click message in contact when no video icon display in contact"

parents 89a21c5e cc18ade5
Loading
Loading
Loading
Loading
+15 −12
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ public class ExpandingEntryCardView extends CardView {
    private String mContactName;
    private Handler mHandler;
    private boolean mEnablePresence = false;
    private boolean mHaveFetched = false;

    private static final Property<View, Integer> VIEW_LAYOUT_HEIGHT_PROPERTY =
            new Property<View, Integer>(Integer.class, "height") {
@@ -890,6 +891,7 @@ public class ExpandingEntryCardView extends CardView {
        if (mEnablePresence) {
            if (mEnable == CallUtil.ENABLE_VIDEO_CALLING) {
                showVTicon = ContactDisplayUtils.getVTCapability(entry.getHeader());
                if(!mHaveFetched){
                    new Thread(new Runnable(){
                        public void run(){
                            if (null != entry.getHeader()) {
@@ -898,14 +900,15 @@ public class ExpandingEntryCardView extends CardView {
                                boolean newVT = ContactDisplayUtils.startAvailabilityFetch(
                                            entry.getHeader());
                                if (oldVT != newVT) {
                                    mHaveFetched = true;
                                    mHandler.sendEmptyMessage(PRESENCE_AVAILABILITY_FETCH);
                                }
                            }
                        }

                    }).start();
                }
            }
        }
        if (entry.getThirdIcon() != null && entry.getThirdAction() != Entry.ACTION_NONE
                && (mEnablePresence ? showVTicon : true/*This true is used for the keep AOSP*/)) {
            thirdIcon.setImageDrawable(entry.getThirdIcon());