Fix proximity sensor and sleep timer

Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m

@@ -1422,29 +1422,31 @@ - (void)updateTimeStatusLabel
     }
 }
 
-- (void)updateProximityAndSleep
-{
-    BOOL inCall = (mxCall.state == MXCallStateConnected || mxCall.state == MXCallStateRinging || mxCall.state == MXCallStateInviteSent || mxCall.state == MXCallStateConnecting || mxCall.state == MXCallStateCreateOffer || mxCall.state == MXCallStateCreateAnswer);
-
-    if (inCall)
-    {
-        BOOL isBuiltInReceiverUsed = self.isBuiltInReceiverAudioOuput;
-
-        // Enable the proximity monitoring when the built in receiver is used as the audio output.
-        BOOL enableProxMonitoring = isBuiltInReceiverUsed;
-        [[UIDevice currentDevice] setProximityMonitoringEnabled:enableProxMonitoring];
-
-        // Disable the idle timer during a video call, or during a voice call which is performed with the built-in receiver.
-        // Note: if the device is locked, VoIP calling get dropped if an incoming GSM call is received.
-        BOOL disableIdleTimer = mxCall.isVideoCall || isBuiltInReceiverUsed;
-
-        UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
-        if (sharedApplication)
-        {
-            sharedApplication.idleTimerDisabled = disableIdleTimer;
-        }
-    }
-}
+ - (void)updateProximityAndSleep
+ {
+     BOOL inCall = (mxCall.state == MXCallStateConnected || mxCall.state == MXCallStateRinging || mxCall.state == MXCallStateInviteSent || mxCall.state == MXCallStateConnecting || mxCall.state == MXCallStateCreateOffer || mxCall.state == MXCallStateCreateAnswer);
+
+     BOOL isBuiltInReceiverUsed = self.isBuiltInReceiverAudioOuput;
+
+     // Enable the proximity monitoring when the built in receiver is used as the audio output.
+     BOOL enableProxMonitoring = inCall && isBuiltInReceiverUsed;
+
+     UIDevice *device = [UIDevice currentDevice];
+     if (device && device.isProximityMonitoringEnabled != enableProxMonitoring)
+     {
+         [device setProximityMonitoringEnabled:enableProxMonitoring];
+     }
+
+     // Disable the idle timer during a video call, or during a voice call which is performed with the built-in receiver.
+     // Note: if the device is locked, VoIP calling get dropped if an incoming GSM call is received.
+     BOOL disableIdleTimer = inCall && (mxCall.isVideoCall || isBuiltInReceiverUsed);
+
+     UIApplication *sharedApplication = [UIApplication performSelector:@selector(sharedApplication)];
+     if (sharedApplication && sharedApplication.isIdleTimerDisabled != disableIdleTimer)
+     {
+         sharedApplication.idleTimerDisabled = disableIdleTimer;
+     }
+ }
 
 - (UIView *)createIncomingCallView
 {

changelog.d/4103.bugfix

@@ -0,0 +1 @@
+Fix proximity sensor staying on and sleep timer staying disabled after call ends