following the OpenWeatherMap recommendations: update 1 time per 10 minutes
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 23 Nov 2014 22:42:35 +0000 (23:42 +0100)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Sun, 23 Nov 2014 22:42:35 +0000 (23:42 +0100)
http://openweathermap.org/appid

app/src/main/java/name/gumartinm/weather/information/fragment/preferences/PreferencesFragment.java
app/src/main/res/values/arrays.xml
app/src/main/res/values/strings.xml
app/src/main/res/xml/weather_preferences.xml

index c3cfa17..7ff937f 100644 (file)
@@ -125,8 +125,6 @@ public class PreferencesFragment extends PreferenceFragment implements OnSharedP
             humanValue = humanValues[4];
         } else if (value.equals(values[5])) {
             humanValue = humanValues[5];
-        } else if (value.equals(values[6])) {
-            humanValue = humanValues[6];
         }
         connectionPref.setSummary(humanValue);
 
@@ -299,8 +297,6 @@ public class PreferencesFragment extends PreferenceFragment implements OnSharedP
                 humanValue = humanValues[4];
             } else if (value.equals(values[5])) {
                 humanValue = humanValues[5];
-            } else if (value.equals(values[6])) {
-                humanValue = humanValues[6];
             }
             connectionPref.setSummary(humanValue);
             return;
index 09a2a49..3aa7a25 100644 (file)
@@ -40,7 +40,6 @@
         <item>@string/weather_preferences_update_time_rate_human_value_one_day</item>
     </string-array>
     <string-array name="weather_preferences_refresh_interval">
-        <item>@string/refresh_interval_300000</item>
         <item>@string/refresh_interval_900000</item>
         <item>@string/refresh_interval_1800000</item>
         <item>@string/refresh_interval_3600000</item>
@@ -49,7 +48,6 @@
         <item>@string/refresh_interval_86400000</item>
     </string-array>
     <string-array name="weather_preferences_refresh_interval_human_value">
-        <item>@string/weather_preferences_refresh_interval_human_value_five_minutes</item>
         <item>@string/weather_preferences_refresh_interval_human_value_fifteen_minutes</item>
         <item>@string/weather_preferences_refresh_interval_human_value_half_hour</item>
         <item>@string/weather_preferences_refresh_interval_human_value_one_hour</item>
index d96f71d..dd68653 100644 (file)
@@ -63,7 +63,6 @@
     <string name="weather_preferences_update_time_rate_human_value_one_hour">one hour</string>
     <string name="weather_preferences_update_time_rate_human_value_half_day">half day</string>
     <string name="weather_preferences_update_time_rate_human_value_one_day">one day</string>
-    <string name="weather_preferences_refresh_interval_human_value_five_minutes">five minutes</string>
     <string name="weather_preferences_refresh_interval_human_value_fifteen_minutes">fifteen minutes</string>
     <string name="weather_preferences_refresh_interval_human_value_half_hour">half hour</string>
     <string name="weather_preferences_refresh_interval_human_value_one_hour">one hour</string>
     <string name="update_time_rate_3600">3600</string>
     <string name="update_time_rate_43200">43200</string>
     <string name="update_time_rate_86400">86400</string>
-    <string name="refresh_interval_300000">300000</string>
     <string name="refresh_interval_900000">900000</string>
     <string name="refresh_interval_1800000">1800000</string>
     <string name="refresh_interval_3600000">3600000</string>
index 81b3080..a38d7a0 100644 (file)
@@ -29,7 +29,7 @@
         android:entryValues="@array/weather_preferences_refresh_interval"
         android:selectable="true"
         android:persistent="true"
-        android:defaultValue="300000"
+        android:defaultValue="@string/refresh_interval_900000"
         android:summary="five minutes" />
     <PreferenceCategory android:title="@string/weather_preferences_units">
         <ListPreference android:key="@string/weather_preferences_temperature_key"