I2P_Developers/i2p.android.base
3
0
Fork 2
Code Issues 39 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix default graphs

Browse Source
This commit is contained in:
str4d
2015-05-08 08:18:22 +00:00
parent 8d9a532424
commit 2e6ff0ac07
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/net/i2p/android/preferences/GraphsPreferenceFragment.java
View File

@ -1,8 +1,10 @@
package net.i2p.android.preferences;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
import android.preference.PreferenceScreen;
import net.i2p.android.router.R;
@ -19,6 +21,8 @@ import java.util.Map;
import java.util.SortedSet;
public class GraphsPreferenceFragment extends I2PreferenceFragment {
public static final String GRAPH_PREFERENCES_SEEN = "graphPreferencesSeen";
@Override
public void onCreate(Bundle paramBundle) {
super.onCreate(paramBundle);
@ -92,6 +96,13 @@ public class GraphsPreferenceFragment extends I2PreferenceFragment {
groupPrefs.addPreference(statPref);
}
}
// The user has now seen the current (possibly default) configuration
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
if (!prefs.getBoolean(GRAPH_PREFERENCES_SEEN, false))
prefs.edit()
.putBoolean(GRAPH_PREFERENCES_SEEN, true)
.apply();
}
}
}

5
app/src/main/java/net/i2p/android/router/util/Util.java
View File

@ -8,6 +8,7 @@ import android.content.res.Resources;
import android.preference.PreferenceManager;
import net.i2p.I2PAppContext;
import net.i2p.android.preferences.GraphsPreferenceFragment;
import net.i2p.android.router.I2PConstants;
import net.i2p.android.router.service.State;
import net.i2p.data.DataHelper;
@ -172,7 +173,11 @@ public abstract class Util implements I2PConstants {
}
}
if (statSummaries.isEmpty()) {
// If the graph preferences have not yet been seen, they should be the default
if (preferences.getBoolean(GraphsPreferenceFragment.GRAPH_PREFERENCES_SEEN, false))
routerProps.setProperty("stat.summaries", "");
else
toRemove.setProperty("stat.summaries", "");
} else {
Iterator<String> iter = statSummaries.iterator();
StringBuilder buf = new StringBuilder(iter.next());