diff --git a/TMessagesProj/src/main/java/com/exteragram/messenger/ExteraConfig.java b/TMessagesProj/src/main/java/com/exteragram/messenger/ExteraConfig.java index 026b33346..414cc39b6 100644 --- a/TMessagesProj/src/main/java/com/exteragram/messenger/ExteraConfig.java +++ b/TMessagesProj/src/main/java/com/exteragram/messenger/ExteraConfig.java @@ -65,7 +65,6 @@ public class ExteraConfig { public static boolean disableNumberRounding; public static boolean formatTimeWithSeconds; - public static boolean disableProximitySensor; public static int tabletMode; public static int downloadSpeedBoost; @@ -164,7 +163,6 @@ public class ExteraConfig { disableNumberRounding = preferences.getBoolean("disableNumberRounding", false); formatTimeWithSeconds = preferences.getBoolean("formatTimeWithSeconds", false); - disableProximitySensor = preferences.getBoolean("disableProximitySensor", false); tabletMode = preferences.getInt("tabletMode", 0); downloadSpeedBoost = preferences.getInt("downloadSpeedBoost", 0); diff --git a/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/GeneralPreferencesActivity.java b/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/GeneralPreferencesActivity.java index bd7239fcc..531d691bb 100644 --- a/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/GeneralPreferencesActivity.java +++ b/TMessagesProj/src/main/java/com/exteragram/messenger/preferences/GeneralPreferencesActivity.java @@ -73,7 +73,6 @@ public class GeneralPreferencesActivity extends BasePreferencesActivity { private int generalHeaderRow; private int formatTimeWithSecondsRow; private int disableNumberRoundingRow; - private int disableProximitySensorRow; private int tabletModeRow; private int generalDividerRow; @@ -110,7 +109,6 @@ public class GeneralPreferencesActivity extends BasePreferencesActivity { generalHeaderRow = newRow(); disableNumberRoundingRow = newRow(); formatTimeWithSecondsRow = newRow(); - disableProximitySensorRow = newRow(); tabletModeRow = newRow(); generalDividerRow = newRow(); @@ -141,9 +139,6 @@ public class GeneralPreferencesActivity extends BasePreferencesActivity { ((TextCheckCell) view).setChecked(ExteraConfig.formatTimeWithSeconds); LocaleController.getInstance().recreateFormatters(); parentLayout.rebuildAllFragmentViews(false, false); - } else if (position == disableProximitySensorRow) { - ExteraConfig.editor.putBoolean("disableProximitySensor", ExteraConfig.disableProximitySensor ^= true).apply(); - ((TextCheckCell) view).setChecked(ExteraConfig.disableProximitySensor); } else if (position == tabletModeRow) { if (getParentActivity() == null) { return; @@ -269,8 +264,6 @@ public class GeneralPreferencesActivity extends BasePreferencesActivity { textCheckCell.setTextAndValueAndCheck(LocaleController.getString("DisableNumberRounding", R.string.DisableNumberRounding), "1.23K -> 1,234", ExteraConfig.disableNumberRounding, true, true); } else if (position == formatTimeWithSecondsRow) { textCheckCell.setTextAndValueAndCheck(LocaleController.getString("FormatTimeWithSeconds", R.string.FormatTimeWithSeconds), "12:34 -> 12:34:56", ExteraConfig.formatTimeWithSeconds, true, true); - } else if (position == disableProximitySensorRow) { - textCheckCell.setTextAndCheck(LocaleController.getString("DisableProximitySensor", R.string.DisableProximitySensor), ExteraConfig.disableProximitySensor, true); } else if (position == disableUnarchiveSwipeRow) { textCheckCell.setTextAndCheck(LocaleController.getString("DisableUnarchiveSwipe", R.string.DisableUnarchiveSwipe), ExteraConfig.disableUnarchiveSwipe, false); } else if (position == archiveOnPullRow) { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java index f999536c4..4a65c8041 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java @@ -952,7 +952,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } proximitySensor = sensorManager.getDefaultSensor(Sensor.TYPE_PROXIMITY); PowerManager powerManager = (PowerManager) ApplicationLoader.applicationContext.getSystemService(Context.POWER_SERVICE); - proximityWakeLock = ExteraConfig.disableProximitySensor ? null : powerManager.newWakeLock(0x00000020, "telegram:proximity_lock"); + proximityWakeLock = powerManager.newWakeLock(0x00000020, "telegram:proximity_lock"); } catch (Exception e) { FileLog.e(e); } @@ -1471,7 +1471,7 @@ public class MediaController implements AudioManager.OnAudioFocusChangeListener, } private boolean isNearToSensor(float value) { - return !ExteraConfig.disableProximitySensor && value < 5.0f && value != proximitySensor.getMaximumRange(); + return value < 5.0f && value != proximitySensor.getMaximumRange(); } public boolean isRecordingOrListeningByProximity() { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java b/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java index b30ec66a4..4b2c20491 100755 --- a/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/voip/VoIPService.java @@ -3741,7 +3741,7 @@ public class VoIPService extends Service implements SensorEventListener, AudioMa SensorManager sm = (SensorManager) getSystemService(SENSOR_SERVICE); Sensor proximity = sm.getDefaultSensor(Sensor.TYPE_PROXIMITY); try { - if (!ExteraConfig.disableProximitySensor && proximity != null) { + if (proximity != null) { proximityWakelock = ((PowerManager) getSystemService(Context.POWER_SERVICE)).newWakeLock(PROXIMITY_SCREEN_OFF_WAKE_LOCK, "telegram-voip-prx"); sm.registerListener(this, proximity, SensorManager.SENSOR_DELAY_NORMAL); } diff --git a/TMessagesProj/src/main/res/values-de/extera.xml b/TMessagesProj/src/main/res/values-de/extera.xml index dc46d6ad9..8a6326a02 100644 --- a/TMessagesProj/src/main/res/values-de/extera.xml +++ b/TMessagesProj/src/main/res/values-de/extera.xml @@ -68,7 +68,6 @@ CameraX wird nur auf Kameraqualität Zahlen nicht runden Zeit mit Sekunden formatieren - Näherungssensor deaktivieren Tablet-Modus Beschleunigtes Herunterladen Beschleunigtes Hochladen diff --git a/TMessagesProj/src/main/res/values-pl/extera.xml b/TMessagesProj/src/main/res/values-pl/extera.xml index eb0d8bc3d..416010888 100644 --- a/TMessagesProj/src/main/res/values-pl/extera.xml +++ b/TMessagesProj/src/main/res/values-pl/extera.xml @@ -68,7 +68,6 @@ CameraX wspierana jest tylko na Jakość aparatu Wyłącz zaokrąglanie liczb Formatuj czas z sekundami - Wyłącz czujnik zbliżeniowy Tryb tabletu Zwiększ szybkość pobierania Zwiększ szybkość wysyłania diff --git a/TMessagesProj/src/main/res/values-pt-rBR/extera.xml b/TMessagesProj/src/main/res/values-pt-rBR/extera.xml index d7265e291..c24eb3c15 100644 --- a/TMessagesProj/src/main/res/values-pt-rBR/extera.xml +++ b/TMessagesProj/src/main/res/values-pt-rBR/extera.xml @@ -68,7 +68,6 @@ CameraX só é suportada nos Qualidade da Câmera Desativar arredondamento de números Formatar a hora com segundos - Desativar sensor de proximidade Modo Tablet Otimizar velocidade de download Aumentar velocidade de upload diff --git a/TMessagesProj/src/main/res/values-ru/extera.xml b/TMessagesProj/src/main/res/values-ru/extera.xml index aaebc774b..b83724688 100644 --- a/TMessagesProj/src/main/res/values-ru/extera.xml +++ b/TMessagesProj/src/main/res/values-ru/extera.xml @@ -85,7 +85,6 @@ Отключить округление чисел Показывать время с секундами - Отключить датчик приближения Планшетный режим Профиль diff --git a/TMessagesProj/src/main/res/values-uk/extera.xml b/TMessagesProj/src/main/res/values-uk/extera.xml index 106b9a9d5..2a346fa3a 100644 --- a/TMessagesProj/src/main/res/values-uk/extera.xml +++ b/TMessagesProj/src/main/res/values-uk/extera.xml @@ -68,7 +68,6 @@ CameraX підтримується тільки на Якість камери Вимкнути округлення чисел Форматувати час з секундами - Вимкнути датчик наближення Режим планшета Прискорення швидкості завантаження Збільшення швидкості завантаження diff --git a/TMessagesProj/src/main/res/values-zh-rCN/extera.xml b/TMessagesProj/src/main/res/values-zh-rCN/extera.xml index 11d521cf7..95850375a 100644 --- a/TMessagesProj/src/main/res/values-zh-rCN/extera.xml +++ b/TMessagesProj/src/main/res/values-zh-rCN/extera.xml @@ -68,7 +68,6 @@ CameraX仅支持 相机清晰度 禁用数字舍入 时间精确到秒 - 禁用距离传感器 平板模式 下载加速 上传加速 diff --git a/TMessagesProj/src/main/res/values/extera.xml b/TMessagesProj/src/main/res/values/extera.xml index f2d397527..3616feb2e 100644 --- a/TMessagesProj/src/main/res/values/extera.xml +++ b/TMessagesProj/src/main/res/values/extera.xml @@ -83,7 +83,6 @@ Disable Number Rounding Format Time with Seconds - Disable Proximity Sensor Tablet Mode Download Speed Boost