propagate from branch 'i2p.android.base.fragments' (head d590551a58afc8cebc67722afc73494e4f8836c0)

to branch 'i2p.android.base' (head e20ea0056b24eb0050ae3be6d84aac6e5157503d)
This commit is contained in:
str4d
2015-05-01 10:25:16 +00:00
4 changed files with 16 additions and 3 deletions

View File

@ -1,3 +1,6 @@
0.9.19.1 / 2015-04-15 / ed86e7e85161dbe3f15932fd4d195c551f8e2c71
* Fixed crash when opening advanced settings
0.9.19 / 2015-04-13 / 3cfb748946a5876dc06d5f81d811b142a88846f7
* Made internal state handling more stable
* Added graceful shutdown support

View File

@ -5,8 +5,8 @@ android {
compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION as String
defaultConfig {
versionCode 4745227
versionName '0.9.19'
versionCode 4745229
versionName '0.9.19.1'
minSdkVersion 9
targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)

View File

@ -15,6 +15,15 @@ public class IntListPreference extends ListPreference {
@Override
protected boolean persistString(String value) {
if (getSharedPreferences().contains(getKey())) {
try {
getPersistedInt(0);
} catch (ClassCastException e) {
// Fix for where this preference was previously stored in a ListPreference
getSharedPreferences().edit().remove(getKey()).commit();
}
}
return value != null && persistInt(Integer.valueOf(value));
}
@ -25,7 +34,7 @@ public class IntListPreference extends ListPreference {
int intValue = getPersistedInt(0);
return String.valueOf(intValue);
} catch (ClassCastException e) {
return getPersistedString("0");
return super.getPersistedString("0");
}
} else {
return defaultReturnValue;

View File

@ -23,6 +23,7 @@
<string name="label_graphs">Gráficos</string>
<string name="button_router_off">Pressionar longo para iniciar I2P</string>
<string name="button_router_on">I2P está em execução (pressionar longo para para)</string>
<string name="button_router_graceful">I2P será desligado em %s</string>
<!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
<string name="char_client_tunnel">C</string>
<!--Character to indicate a server tunnel. Usually first letter of the word "server".-->