From 25a8c94c8184cf950996ec7aefa07ccb5fd90241 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Tue, 4 Dec 2012 11:04:08 +0400
Subject: [PATCH] offline up arrow fixes; bump version; make amount of articles
 downloaded in offline mode configurable

---
 AndroidManifest.xml                                  |  4 ++--
 res/values/arrays.xml                                |  6 +++++-
 res/values/strings.xml                               |  5 +++--
 res/xml/preferences.xml                              | 12 +++++++++---
 .../fox/ttrss/offline/OfflineDownloadService.java    |  2 +-
 src/org/fox/ttrss/offline/OfflineFeedsActivity.java  |  2 +-
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 56fb223d..2c2b4235 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="115"
-    android:versionName="0.8.14" >
+    android:versionCode="116"
+    android:versionName="0.9" >
 
     <uses-sdk
         android:minSdkVersion="8"
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 961bd955..4a2ac390 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -25,5 +25,9 @@
         <item>HEADLINES</item>
         <item>ARTICLES</item>
     </string-array>
-    
+    <string-array name="pref_offline_amounts">
+        <item>150</item>
+        <item>250</item>
+        <item>500</item>
+    </string-array>    
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index df40d273..c85634ef 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -52,7 +52,7 @@
     <string name="http_login_summary">Optional. Fill this if your tt-rss installation is protected by HTTP Basic authentication</string>
     <string name="login_summary">Your tt-rss login. Not needed for single user mode</string>
     <string name="ttrss_url_summary">URL of your tt-rss installation directory, e.g. http://site.com/tt-rss/</string>
-    <string name="download_feed_icons">Download and display feed icons</string>
+    <string name="download_feed_icons">Enable feed icons</string>
     <string name="enable_cats">Enable feed categories</string>
     <string name="no_feeds_to_display">No feeds to display</string>
     <string name="no_headlines_to_display">No headlines to display</string>
@@ -144,6 +144,7 @@
     <string name="ssl">SSL</string>
     <string name="error_ssl_hostname_rejected">Error: SSL hostname not verified</string>
     <string name="offline_oldest_first">Show oldest articles first</string>
-    <string name="prefs_dim_status_bar">Dim status bar when reading</string>
+    <string name="prefs_dim_status_bar">Dim status bar</string>
+    <string name="prefs_dim_status_bar_long">Dim status bar when reading</string>
     <string name="article_comments">%1$d comments</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c1a69321..0f143b15 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -90,7 +90,7 @@
             android:defaultValue="false"
             android:key="combined_mode"
             android:summary="@string/combined_mode_summary"
-            android:title="@string/combined_mode" />


+            android:title="@string/combined_mode" />



         -->
 
         <CheckBoxPreference
@@ -111,14 +111,20 @@
             android:key="use_volume_keys"
             android:summary="@string/use_volume_keys_long"
             android:title="@string/use_volume_keys" />
-        
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="dim_status_bar"
+            android:summary="@string/prefs_dim_status_bar_long"
             android:title="@string/prefs_dim_status_bar" />
-        
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/offline_mode" >
+        <ListPreference
+            android:defaultValue="250"
+            android:entries="@array/pref_offline_amounts"
+            android:entryValues="@array/pref_offline_amounts"
+            android:key="offline_sync_max"
+            android:summary="How many articles to download (newest first)"
+            android:title="Download articles" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="offline_image_cache_enabled"
diff --git a/src/org/fox/ttrss/offline/OfflineDownloadService.java b/src/org/fox/ttrss/offline/OfflineDownloadService.java
index c3a0444c..992c21f6 100644
--- a/src/org/fox/ttrss/offline/OfflineDownloadService.java
+++ b/src/org/fox/ttrss/offline/OfflineDownloadService.java
@@ -82,7 +82,7 @@ public class OfflineDownloadService extends Service {
 						.getDefaultSharedPreferences(getApplicationContext());
  
 		m_downloadImages = m_prefs.getBoolean("offline_image_cache_enabled", false);
-		m_syncMax = m_prefs.getInt("offline_sync_max", OFFLINE_SYNC_MAX);
+		m_syncMax = Integer.parseInt(m_prefs.getString("offline_sync_max", String.valueOf(OFFLINE_SYNC_MAX)));
 		
 		initDatabase();
 	}
diff --git a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
index 99351849..07bedc37 100644
--- a/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
+++ b/src/org/fox/ttrss/offline/OfflineFeedsActivity.java
@@ -56,7 +56,7 @@ public class OfflineFeedsActivity extends OfflineActivity implements OfflineHead
 				
 				if (!isCompatMode()) {
 					getActionBar().setDisplayHomeAsUpEnabled(true);
-					
+					m_actionbarUpEnabled = true;
 				}
 				
 				FragmentTransaction ft = getSupportFragmentManager().beginTransaction();