public/cordova-android
public/cordova-android
9
0
Fork 0
forked from github/cordova-android
Code Pull Requests Activity

making preference reading code more robust

Browse Source
This commit is contained in:
alunny 2012-01-02 22:40:08 -08:00
parent 3af4d6b139
commit ffa76246e3
3 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
framework/src/com/phonegap/DroidGap.java
View File

@ -329,7 +329,7 @@ public class DroidGap extends PhonegapActivity {
getWindow().requestFeature(Window.FEATURE_NO_TITLE); getWindow().requestFeature(Window.FEATURE_NO_TITLE);
if (preferences.pref("fullscreen").equals("true")) { if (preferences.prefMatches("fullscreen","true")) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN); WindowManager.LayoutParams.FLAG_FULLSCREEN);
} else { } else {
@ -1901,7 +1901,8 @@ public class DroidGap extends PhonegapActivity {
String value = xml.getAttributeValue(null, "value"); String value = xml.getAttributeValue(null, "value");
String readonlyString = xml.getAttributeValue(null, "readonly"); String readonlyString = xml.getAttributeValue(null, "readonly");
boolean readonly = (readonlyString.equals("true")); boolean readonly = (readonlyString != null &&
readonlyString.equals("true"));
LOG.i("PhoneGapLog", "Found preference for %s", name); LOG.i("PhoneGapLog", "Found preference for %s", name);

10
framework/src/com/phonegap/PreferenceSet.java
View File

@ -30,4 +30,14 @@ public class PreferenceSet {
return null; return null;
} }
public boolean prefMatches(String prefName, String prefValue) {
String value = pref(prefName);
if (value == null) {
return false;
} else {
return value.equals(prefValue);
}
}
} }

14
framework/test/com/phonegap/PreferenceSetTest.java
View File

@ -38,4 +38,18 @@ public class PreferenceSetTest {
// return null if the preference is not defined // return null if the preference is not defined
assertEquals(null, preferences.pref("antigravity")); assertEquals(null, preferences.pref("antigravity"));
} }
@Test
public void testUnsetPreferenceChecking() {
PreferenceSet emptySet = new PreferenceSet();
boolean value = emptySet.prefMatches("fullscreen", "true");
assertEquals(false, value);
}
@Test
public void testSetPreferenceChecking() {
preferences.add(screen);
boolean value = preferences.prefMatches("fullscreen", "true");
assertEquals(true, value);
}
} }