Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removing useless preference

Browse source 
Doze mod
This commit is contained in:
Erwan Croze 2017-10-03 16:49:51 +02:00
parent 7140eea562
commit f2a6888773
4 changed files with 7 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/xml/preferences.xml
View file

@ -270,11 +270,6 @@
android:key="@string/pref_wifi_only_key" android:key="@string/pref_wifi_only_key"
android:persistent="false"/> android:persistent="false"/>
<CheckBoxPreference
android:title="@string/pref_doze_mode"
android:key="@string/pref_doze_mode_key"
android:persistent="false"/>
<EditTextPreference <EditTextPreference
android:title="@string/pref_stun_server" android:title="@string/pref_stun_server"
android:key="@string/pref_stun_server_key" android:key="@string/pref_stun_server_key"

16
src/android/org/linphone/LinphoneManager.java
View file

@ -856,15 +856,12 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
if (mPrefs.isDozeModeEnabled()) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { mDozeIntentFilter = new IntentFilter();
mDozeIntentFilter = new IntentFilter(); mDozeIntentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
mDozeIntentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED); mDozeReceiver = new DozeReceiver();
mDozeReceiver = new DozeReceiver(); dozeModeEnabled = ((PowerManager) mServiceContext.getSystemService(Context.POWER_SERVICE)).isDeviceIdleMode();
dozeModeEnabled = ((PowerManager) mServiceContext.getSystemService(Context.POWER_SERVICE)).isDeviceIdleMode(); mServiceContext.registerReceiver(mDozeReceiver, mDozeIntentFilter);
if (dozeModeEnabled)
mServiceContext.registerReceiver(mDozeReceiver, mDozeIntentFilter);
}
} }
mHookIntentFilter = new IntentFilter("com.base.module.phone.HOOKEVENT"); mHookIntentFilter = new IntentFilter("com.base.module.phone.HOOKEVENT");
@ -1085,7 +1082,6 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
dozeModeEnabled = false; dozeModeEnabled = false;
} }

10
src/android/org/linphone/LinphonePreferences.java
View file

@ -1553,16 +1553,6 @@ public class LinphonePreferences {
return getConfig().getInt("app", "activation_code_length", 0); return getConfig().getInt("app", "activation_code_length", 0);
} }
public boolean isDozeModeEnabled() {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
return false;
return getConfig().getBool("app", "doze_mode", true);
}
public void enableDozeMode(boolean enable) {
getConfig().setBool("app", "doze_mode", enable);
}
public void disableFriendsStorage() { public void disableFriendsStorage() {
getConfig().setBool("misc", "store_friends", false); getConfig().setBool("misc", "store_friends", false);
} }

12
src/android/org/linphone/SettingsFragment.java
View file

@ -48,6 +48,7 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.media.AudioManager; import android.media.AudioManager;
import android.net.Uri; import android.net.Uri;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
@ -1081,8 +1082,6 @@ public class SettingsFragment extends PreferencesListFragment {
private void initNetworkSettings() { private void initNetworkSettings() {
((CheckBoxPreference) findPreference(getString(R.string.pref_wifi_only_key))).setChecked(mPrefs.isWifiOnlyEnabled()); ((CheckBoxPreference) findPreference(getString(R.string.pref_wifi_only_key))).setChecked(mPrefs.isWifiOnlyEnabled());
((CheckBoxPreference) findPreference(getString(R.string.pref_doze_mode_key))).setChecked(mPrefs.isDozeModeEnabled());
// Disable UPnP if ICE si enabled, or disable ICE if UPnP is enabled // Disable UPnP if ICE si enabled, or disable ICE if UPnP is enabled
CheckBoxPreference ice = (CheckBoxPreference) findPreference(getString(R.string.pref_ice_enable_key)); CheckBoxPreference ice = (CheckBoxPreference) findPreference(getString(R.string.pref_ice_enable_key));
CheckBoxPreference turn = (CheckBoxPreference) findPreference(getString(R.string.pref_turn_enable_key)); CheckBoxPreference turn = (CheckBoxPreference) findPreference(getString(R.string.pref_turn_enable_key));
@ -1123,15 +1122,6 @@ public class SettingsFragment extends PreferencesListFragment {
} }
}); });
findPreference(getString(R.string.pref_doze_mode_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
mPrefs.enableDozeMode((Boolean) newValue);
LinphoneManager.getInstance().dozeManager((Boolean) newValue);
return true;
}
});
findPreference(getString(R.string.pref_stun_server_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() { findPreference(getString(R.string.pref_stun_server_key)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {