From 872683c2eeaf56d1badd34fdaed370cab28f34df Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 20 Oct 2020 15:43:16 +0200 Subject: [PATCH] Fixed tablet issues --- .../org/linphone/activities/call/ProximitySensorActivity.kt | 4 +++- .../main/java/org/linphone/activities/main/Navigation.kt | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/linphone/activities/call/ProximitySensorActivity.kt b/app/src/main/java/org/linphone/activities/call/ProximitySensorActivity.kt index e568fa157..3f4a6d2a7 100644 --- a/app/src/main/java/org/linphone/activities/call/ProximitySensorActivity.kt +++ b/app/src/main/java/org/linphone/activities/call/ProximitySensorActivity.kt @@ -60,7 +60,9 @@ abstract class ProximitySensorActivity : GenericActivity() { try { sensorManager = getSystemService(Context.SENSOR_SERVICE) as SensorManager - proximitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY) + val sensor: Sensor? = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY) + sensor ?: return + proximitySensor = sensor proximityWakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager) .newWakeLock( PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, diff --git a/app/src/main/java/org/linphone/activities/main/Navigation.kt b/app/src/main/java/org/linphone/activities/main/Navigation.kt index eaa32a2dc..f2054f2c4 100644 --- a/app/src/main/java/org/linphone/activities/main/Navigation.kt +++ b/app/src/main/java/org/linphone/activities/main/Navigation.kt @@ -136,7 +136,11 @@ internal fun MasterContactsFragment.navigateToContactEditor(sipUriToAdd: String? internal fun ContactEditorFragment.navigateToContact(contact: NativeContact) { val deepLink = "linphone-android://contact/view/${contact.nativeId}" - findMasterNavController().navigate(Uri.parse(deepLink), getRightToLeftAnimationNavOptions()) + if (!resources.getBoolean(R.bool.isTablet)) { + findMasterNavController().navigate(Uri.parse(deepLink), getRightToLeftAnimationNavOptions()) + } else { + findMasterNavController().navigate(Uri.parse(deepLink)) + } } /* History related */