Fix default ports not initialized in UI

2017-11-30 21:55:29 -08:00
parent be688205ce
commit a6728e6025
2 changed files with 3 additions and 1 deletions
@@ -33,6 +33,9 @@ class GlobalConfigFragment extends PreferenceFragmentCompatDividers {
  override def onCreatePreferencesFix(bundle: Bundle, key: String) {
    getPreferenceManager.setPreferenceDataStore(app.dataStore)
    app.dataStore.putString(Key.serviceMode, app.dataStore.serviceMode) // temporary workaround for support lib bug
+    app.dataStore.putString(Key.portProxy, app.dataStore.portProxy.toString)
+    app.dataStore.putString(Key.portLocalDns, app.dataStore.portLocalDns.toString)
+    app.dataStore.putString(Key.portTransproxy, app.dataStore.portTransproxy.toString)
    addPreferencesFromResource(R.xml.pref_global)
    val switch = findPreference(Key.isAutoConnect).asInstanceOf[SwitchPreference]
    switch.setOnPreferenceChangeListener((_, value) => {
@@ -163,7 +163,6 @@ class ShadowsocksApplication extends Application {
    TcpFastOpen.enabled(dataStore.getBoolean(Key.tfo, TcpFastOpen.sendEnabled))

    if (dataStore.getLong(Key.assetUpdateTime, -1) != info.lastUpdateTime) copyAssets()
-    (dataStore.portProxy, dataStore.portLocalDns, dataStore.portTransproxy) // initialize ports for UI

    if (Build.VERSION.SDK_INT >= 26) {
      val nm = getSystemService(classOf[NotificationManager])