From e14888d19c4f2e4c24bef22203b3bbffa523b291 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 26 Oct 2016 16:43:50 -0700
Subject: [PATCH 01/21] Fixing TT logo image.

---
 templates/mail/email_launch_turntouch.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mail/email_launch_turntouch.xhtml b/templates/mail/email_launch_turntouch.xhtml
index a6502a98c..86128d01f 100644
--- a/templates/mail/email_launch_turntouch.xhtml
+++ b/templates/mail/email_launch_turntouch.xhtml
@@ -2,7 +2,7 @@
 {% load utils_tags %}
 
 {% block body %}
-    <p style="font-size: 24px; color:#555555; margin-top: 18px;margin-bottom: 10px;padding-top:6px;">Introducing <img src="https://turntouch.com/static/images/logos/TT Logo - 64.png" style="width: 32px; height: 32px; vertical-align: bottom;padding-right: 4px;">Turn Touch</p>
+    <p style="font-size: 24px; color:#555555; margin-top: 18px;margin-bottom: 10px;padding-top:6px;">Introducing <img src="https://turntouch.com/static/images/logos/turntouch-icon-64.png" style="width: 32px; height: 32px; vertical-align: bottom;padding-right: 4px;">Turn Touch</p>
     <img src="https://turntouch.com/static/images/home/home-still-mahogany.jpg" style="width:650px;height:433px;" alt="">
     <p style="line-height: 20px;"><a href="https://turntouch.com/kickstarter">Turn Touch</a> is a solid wood remote... for NewsBlur.</p>
     <p style="line-height: 20px;">Your favorite RSS news reader just dropped a gorgeous new piece of hardware on the world and it's built just for you. The you that would enjoy a new way of reading the news. </p>

From 1ae3fa72f92d86e832f0d792efb4caf9128b2b00 Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 27 Oct 2016 13:53:28 -0700
Subject: [PATCH 02/21] ragged right align for story titles when thumbnail
 enabled (#942)

---
 .../NewsBlur/src/com/newsblur/database/StoryItemsAdapter.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/clients/android/NewsBlur/src/com/newsblur/database/StoryItemsAdapter.java b/clients/android/NewsBlur/src/com/newsblur/database/StoryItemsAdapter.java
index 101aaded6..24e942b45 100644
--- a/clients/android/NewsBlur/src/com/newsblur/database/StoryItemsAdapter.java
+++ b/clients/android/NewsBlur/src/com/newsblur/database/StoryItemsAdapter.java
@@ -183,7 +183,8 @@ public class StoryItemsAdapter extends SimpleCursorAdapter {
                 thumbnailView.setVisibility(View.VISIBLE);
                 FeedUtils.thumbnailLoader.displayImage(story.thumbnailUrl, thumbnailView, 0, true);
             } else {
-                thumbnailView.setVisibility(View.INVISIBLE);
+                // to GONE rather than INVIS makes start titles misalign on the right side, but this is by design
+                thumbnailView.setVisibility(View.GONE);
             }
         } else {
             thumbnailView.setVisibility(View.GONE);

From 6b709f52d7831b1ee8897316dcda5ef335771599 Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 27 Oct 2016 13:57:07 -0700
Subject: [PATCH 03/21] enable story thumbs by default (#942)

---
 clients/android/NewsBlur/res/xml/activity_settings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/clients/android/NewsBlur/res/xml/activity_settings.xml b/clients/android/NewsBlur/res/xml/activity_settings.xml
index 62fd20c67..0e758e967 100644
--- a/clients/android/NewsBlur/res/xml/activity_settings.xml
+++ b/clients/android/NewsBlur/res/xml/activity_settings.xml
@@ -61,7 +61,7 @@
             android:key="pref_show_content_preview"
             android:title="@string/settings_show_content_preview" />
         <CheckBoxPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:key="pref_show_thumbnails"
             android:title="@string/settings_show_thumbnails" />
     </PreferenceCategory>

From 7601ad0a48b7272cfcd1f7f9474682575b24308c Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 27 Oct 2016 14:00:21 -0700
Subject: [PATCH 04/21] include thumbs pref in feedback debug dump

---
 clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
index ba5269d07..4050790b7 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
@@ -97,6 +97,7 @@ public class PrefsUtils {
         }
         s.append("%0Aprefetch: ").append(isOfflineEnabled(context) ? "yes" : "no");
         s.append("%0Akeepread: ").append(isKeepOldStories(context) ? "yes" : "no");
+        s.append("%0Athumbs: ").append(isShowThumbnails(context) ? "yes" : "no");
         return s.toString();
     }
 

From 895e784dc2e308b15ff38f743bc672a8e4f7efa6 Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 27 Oct 2016 15:59:18 -0700
Subject: [PATCH 05/21] fix mismatched colour on unread count for collapsed
 social folder

---
 .../android/NewsBlur/res/layout/row_all_shared_stories.xml    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
index 7da59e944..a2836f3aa 100644
--- a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
@@ -42,12 +42,10 @@
             android:gravity="center"
             android:paddingLeft="3dp"
             android:paddingRight="3dp"
-            android:paddingTop="1dp"
-            android:paddingBottom="2dp"
             android:shadowColor="@color/neutral_drop_shadow"
             android:shadowDy="1"
             android:shadowRadius="1"
-            android:textColor="@color/white"
+            style="?feedRowNeutCountText"
             android:textSize="14sp"
             android:textStyle="bold" />
 

From 09cab80fa8317cb307c944cd244a00ad38d8a595 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Fri, 28 Oct 2016 17:04:12 -0700
Subject: [PATCH 06/21] Limiting permalinks when looking at query popularity.

---
 apps/rss_feeds/models.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index 55eaa1087..dd519c406 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -1493,6 +1493,7 @@ class Feed(models.Model):
             stories_db = MStory.objects(story_hash__in=story_ids)
             stories = cls.format_stories(stories_db)
             for story in stories:
+                story['story_permalink'] = story['story_permalink'][:250]
                 if story['story_authors'] not in feed['authors']:
                     feed['authors'][story['story_authors']] = {
                         'name': story['story_authors'],

From f370ac5cd83671af4431f1e5174eb028a148fd5f Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Fri, 28 Oct 2016 18:58:04 -0700
Subject: [PATCH 07/21] better atomic flagging for story session resets by sync
 service

---
 .../com/newsblur/fragment/ItemListFragment.java  |  2 ++
 .../src/com/newsblur/service/NBSyncService.java  | 16 ++++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
index 5649c4bc0..9207c3006 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
@@ -69,6 +69,8 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
 		super.onCreate(savedInstanceState);
         defaultFeedView = (DefaultFeedView)getArguments().getSerializable("defaultFeedView");
         activity = (ItemsList) getActivity();
+        // tell the sync service to discard the reading session at the start of the next sync, just in case
+        NBSyncService.resetReadingSession();
     }
 
 	@Override
diff --git a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
index 1b4f3308d..006d6cb9a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
+++ b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
@@ -633,17 +633,21 @@ public class NBSyncService extends Service {
             StoryOrder order = PrefsUtils.getStoryOrder(this, fs);
             ReadFilter filter = PrefsUtils.getReadFilter(this, fs);
 
+            boolean doReset = false;
             synchronized (PENDING_FEED_MUTEX) {
                 if (ResetSession) {
-                    // the next fetch will be the start of a new reading session; clear it so it
-                    // will be re-primed
-                    dbHelper.clearStorySession();
-                    // don't just rely on the auto-prepare code when fetching stories, it might be called
-                    // after we insert our first page and not trigger
-                    dbHelper.prepareReadingSession(fs);
+                    doReset = true;
                     ResetSession = false;
                 }
             }
+            if (doReset) {
+                // the next fetch will be the start of a new reading session; clear it so it
+                // will be re-primed
+                dbHelper.clearStorySession();
+                // don't just rely on the auto-prepare code when fetching stories, it might be called
+                // after we insert our first page and not trigger
+                dbHelper.prepareReadingSession(fs);
+            }
             
             while (totalStoriesSeen < PendingFeedTarget) {
                 if (stopSync()) return;

From aae3189599507b4ba83a99bc987a40b62a75fcea Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Mon, 31 Oct 2016 14:25:59 -0700
Subject: [PATCH 08/21] ragged right story list if thumbnail present but
 invalid. offload more of thumbnail load to UI thread.

---
 .../src/com/newsblur/util/ImageLoader.java    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/clients/android/NewsBlur/src/com/newsblur/util/ImageLoader.java b/clients/android/NewsBlur/src/com/newsblur/util/ImageLoader.java
index fa291117e..c3f623a89 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/ImageLoader.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/ImageLoader.java
@@ -15,7 +15,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Process;
-import android.util.Log;
+import android.view.View;
 import android.widget.ImageView;
 
 import com.newsblur.R;
@@ -28,25 +28,27 @@ public class ImageLoader {
 	private final ExecutorService executorService;
     private final int emptyRID;
     private final int minImgHeight;
+    private final boolean hideMissing;
 
     // some image loads can happen after the imageview in question is already reused for some other image. keep
     // track of what image each view wants so that when it comes time to load them, they aren't stale
 	private final Map<ImageView, String> imageViewMappings = Collections.synchronizedMap(new WeakHashMap<ImageView, String>());
 
-	private ImageLoader(FileCache fileCache, int emptyRID, int minImgHeight, long memoryCacheSize) {
+	private ImageLoader(FileCache fileCache, int emptyRID, int minImgHeight, boolean hideMissing, long memoryCacheSize) {
         this.memoryCache = new MemoryCache(memoryCacheSize);
 		this.fileCache = fileCache;
 		executorService = Executors.newFixedThreadPool(3);
         this.emptyRID = emptyRID;
         this.minImgHeight = minImgHeight;
+        this.hideMissing = hideMissing;
 	}
 
     public static ImageLoader asIconLoader(Context context) {
-        return new ImageLoader(FileCache.asIconCache(context), R.drawable.world, 2, (Runtime.getRuntime().maxMemory()/20));
+        return new ImageLoader(FileCache.asIconCache(context), R.drawable.world, 2, false, (Runtime.getRuntime().maxMemory()/20));
     }
 
     public static ImageLoader asThumbnailLoader(Context context) {
-        return new ImageLoader(FileCache.asThumbnailCache(context), android.R.color.transparent, 32, (Runtime.getRuntime().maxMemory()/5));
+        return new ImageLoader(FileCache.asThumbnailCache(context), android.R.color.transparent, 32, true, (Runtime.getRuntime().maxMemory()/5));
     }
 	
 	public void displayImage(String url, ImageView imageView, float roundRadius, boolean cropSquare) {
@@ -108,14 +110,12 @@ public class ImageLoader {
 
             if (bitmap != null) {
                 memoryCache.put(photoToLoad.url, bitmap);			
-                setViewImage(bitmap, photoToLoad);
             }
+            setViewImage(bitmap, photoToLoad);
 		}
 	}
 
     private void setViewImage(Bitmap bitmap, PhotoToLoad photoToLoad) {
-        if (bitmap == null) return;
-        if (bitmap.getHeight() < minImgHeight) return;
         BitmapDisplayer bitmapDisplayer = new BitmapDisplayer(bitmap, photoToLoad);
         Activity a = (Activity) photoToLoad.imageView.getContext();
         a.runOnUiThread(bitmapDisplayer);
@@ -133,11 +133,16 @@ public class ImageLoader {
             // ensure this imageview even still wants this image
             String latestMappedUrl = imageViewMappings.get(photoToLoad.imageView);
             if (latestMappedUrl == null || !latestMappedUrl.equals(photoToLoad.url)) return;
-			if (bitmap != null) {
+
+            if ((bitmap == null) || (bitmap.getHeight() < minImgHeight)) {
+                if (hideMissing) {
+                    photoToLoad.imageView.setVisibility(View.GONE);
+                } else {
+                    photoToLoad.imageView.setImageResource(emptyRID);
+                }
+            } else {
                 bitmap = UIUtils.clipAndRound(bitmap, photoToLoad.roundRadius, photoToLoad.cropSquare);
 				photoToLoad.imageView.setImageBitmap(bitmap);
-			} else {
-				photoToLoad.imageView.setImageResource(emptyRID);
 			}
 		}
 	}

From fff85beb23eb5e33e25aa6e2fe59419fec3e8d51 Mon Sep 17 00:00:00 2001
From: David Sinclair <dev@dejal.com>
Date: Tue, 1 Nov 2016 15:10:56 -0700
Subject: [PATCH 09/21] iOS: fixed #960 (returning on iPad reloads story)

A bit tricksy to track down, but videos keep playing and the scroll
position is preserved (on rotation while in the app, too).
---
 clients/ios/Classes/StoryDetailViewController.m | 5 +++++
 clients/ios/Classes/StoryPageControl.m          | 4 +++-
 clients/ios/NewsBlur.xcodeproj/project.pbxproj  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/clients/ios/Classes/StoryDetailViewController.m b/clients/ios/Classes/StoryDetailViewController.m
index 7c59ed015..a416c0c99 100644
--- a/clients/ios/Classes/StoryDetailViewController.m
+++ b/clients/ios/Classes/StoryDetailViewController.m
@@ -2176,6 +2176,11 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
 }
 
 - (void)changeWebViewWidth {
+    // Don't do this in the background, to avoid scrolling to the top unnecessarily
+    if ([UIApplication sharedApplication].applicationState == UIApplicationStateBackground) {
+        return;
+    }
+    
 //    [webView setNeedsLayout];
 //    [webView layoutIfNeeded];
     
diff --git a/clients/ios/Classes/StoryPageControl.m b/clients/ios/Classes/StoryPageControl.m
index ec005f13c..9e288ffee 100644
--- a/clients/ios/Classes/StoryPageControl.m
+++ b/clients/ios/Classes/StoryPageControl.m
@@ -368,7 +368,9 @@
 //        NSLog(@"---> Story page control did re-orient: %@ / %@", NSStringFromCGSize(self.view.bounds.size), NSStringFromCGSize(size));
         [self.view setNeedsLayout];
         [self.view layoutIfNeeded];
-        [self refreshPages];
+        
+        // This causes the story to reload on rotation (or when going to the background), but doesn't seem necessary?
+//        [self refreshPages];
     }];
 }
 
diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
index 4748fc72d..9ee876adb 100755
--- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj
+++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
@@ -2431,7 +2431,7 @@
 		29B97313FDCFA39411CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0800;
+				LastUpgradeCheck = 0810;
 				ORGANIZATIONNAME = NewsBlur;
 				TargetAttributes = {
 					1D6058900D05DD3D006BFB54 = {

From 3702c2ca6b8f85ba1ad47d14135216d58087850e Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Tue, 1 Nov 2016 15:16:53 -0700
Subject: [PATCH 10/21] Moving reach score

---
 apps/rss_feeds/models.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py
index dd519c406..0f2e472c8 100644
--- a/apps/rss_feeds/models.py
+++ b/apps/rss_feeds/models.py
@@ -1572,8 +1572,8 @@ class Feed(models.Model):
             worksheet.write(0, col,   'Feed', bold)
             worksheet.write(0, col+1, 'Feed URL', bold)
             worksheet.write(0, col+2, '# Subs', bold)
-            worksheet.write(0, col+3, 'Reach score', bold)
             worksheet.write(0, col+4, '# Readers', bold)
+            worksheet.write(0, col+3, 'Reach score', bold)
             worksheet.write(0, col+5, 'Read %', bold)
             worksheet.write(0, col+6, '# stories 30d', bold)
             worksheet.write(0, col+7, 'Author', bold)
@@ -1602,8 +1602,8 @@ class Feed(models.Model):
                 worksheet.write(row, col+0, feed['feed_title'])
                 worksheet.write_url(row, col+1, feed['feed_url'])
                 worksheet.write(row, col+2, feed['num_subscribers'])
-                worksheet.write(row, col+3, feed['reach_score'])
                 worksheet.write(row, col+4, feed['reader_count'])
+                worksheet.write(row, col+3, feed['reach_score'])
                 worksheet.write(row, col+5, feed['read_pct'])
                 worksheet.write(row, col+6, feed['story_count'])
                 worksheet.conditional_format(row, col+3, row, col+6, {'type': 'cell',

From d4d0047b31e7f792aa5e801153aae406f2ac3f8a Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Wed, 2 Nov 2016 15:22:31 -0700
Subject: [PATCH 11/21] switch light theme toolbars back to NewsBlur green.
 (#942)

---
 clients/android/NewsBlur/res/values/colors.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/clients/android/NewsBlur/res/values/colors.xml b/clients/android/NewsBlur/res/values/colors.xml
index 776c4071d..cfe75fff0 100644
--- a/clients/android/NewsBlur/res/values/colors.xml
+++ b/clients/android/NewsBlur/res/values/colors.xml
@@ -14,7 +14,9 @@
     <color name="black">#000000</color>
     <color name="transparent">#00000000</color>
 
-    <color name="bar_background">@color/gray90</color>
+    <color name="nb_gren_gray91">#E4E7E1</color>
+
+    <color name="bar_background">@color/nb_gren_gray91</color>
     <color name="dark_bar_background">@color/gray13</color>
 
     <color name="text">@color/gray20</color>

From fcc12ea21c7d0bab0d45fa9c7ffd99abadbfa47b Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Wed, 2 Nov 2016 16:26:14 -0700
Subject: [PATCH 12/21] use shadow-effect story list separator (#942)

---
 .../dark_row_item_feed_header.xml             |  8 -----
 .../feed_background_default.xml               |  4 +--
 .../drawable-nodpi/row_item_feed_header.xml   |  8 -----
 .../NewsBlur/res/layout/fragment_itemlist.xml |  3 +-
 .../layout/include_reading_item_metadata.xml  |  3 +-
 .../res/layout/row_all_shared_stories.xml     |  4 +--
 .../NewsBlur/res/layout/row_all_stories.xml   |  4 +--
 .../NewsBlur/res/layout/row_folder.xml        |  4 +--
 .../res/layout/row_global_shared_stories.xml  |  4 +--
 .../NewsBlur/res/layout/row_read_stories.xml  |  4 +--
 .../NewsBlur/res/layout/row_saved_stories.xml |  4 +--
 .../android/NewsBlur/res/layout/row_story.xml | 11 +++++++
 clients/android/NewsBlur/res/values/attrs.xml |  5 ++-
 .../android/NewsBlur/res/values/colors.xml    | 32 +++++++++----------
 .../android/NewsBlur/res/values/styles.xml    | 30 +++++------------
 clients/android/NewsBlur/res/values/theme.xml | 12 +++----
 .../newsblur/fragment/ItemListFragment.java   |  2 --
 17 files changed, 56 insertions(+), 86 deletions(-)
 delete mode 100644 clients/android/NewsBlur/res/drawable-nodpi/dark_row_item_feed_header.xml
 delete mode 100644 clients/android/NewsBlur/res/drawable-nodpi/row_item_feed_header.xml

diff --git a/clients/android/NewsBlur/res/drawable-nodpi/dark_row_item_feed_header.xml b/clients/android/NewsBlur/res/drawable-nodpi/dark_row_item_feed_header.xml
deleted file mode 100644
index b09fdbfc9..000000000
--- a/clients/android/NewsBlur/res/drawable-nodpi/dark_row_item_feed_header.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <gradient
-            android:angle=     "270"
-            android:type=      "linear"
-            android:startColor="@color/dark_feed_background_start"
-            android:endColor=  "@color/dark_feed_background_end" />
-</shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/feed_background_default.xml b/clients/android/NewsBlur/res/drawable-nodpi/feed_background_default.xml
index d0c4c64fd..39a3c86c7 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/feed_background_default.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/feed_background_default.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <solid android:color="@color/feed_background" />
-</shape>
\ No newline at end of file
+    <solid android:color="@color/gray96" />
+</shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/row_item_feed_header.xml b/clients/android/NewsBlur/res/drawable-nodpi/row_item_feed_header.xml
deleted file mode 100644
index e44d16610..000000000
--- a/clients/android/NewsBlur/res/drawable-nodpi/row_item_feed_header.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <gradient
-            android:angle=     "270"
-            android:type=      "linear"
-            android:startColor="@color/feed_background_start"
-            android:endColor=  "@color/feed_background_end" />
-</shape>
diff --git a/clients/android/NewsBlur/res/layout/fragment_itemlist.xml b/clients/android/NewsBlur/res/layout/fragment_itemlist.xml
index b1dc0a7ac..2f6772058 100644
--- a/clients/android/NewsBlur/res/layout/fragment_itemlist.xml
+++ b/clients/android/NewsBlur/res/layout/fragment_itemlist.xml
@@ -44,7 +44,6 @@
         android:id="@+id/itemlistfragment_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        style="?divider"
-        android:dividerHeight="1dp" />
+        android:divider="@null" />
     
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/include_reading_item_metadata.xml b/clients/android/NewsBlur/res/layout/include_reading_item_metadata.xml
index 164751ecc..d8bf2c1a7 100644
--- a/clients/android/NewsBlur/res/layout/include_reading_item_metadata.xml
+++ b/clients/android/NewsBlur/res/layout/include_reading_item_metadata.xml
@@ -17,8 +17,7 @@
             android:layout_width="match_parent"
             android:minHeight="6dp"
             android:paddingTop="4dp"
-            android:paddingBottom="4dp"
-            style="?rowItemFeedHeader">
+            android:paddingBottom="4dp" >
 
             <ImageView
                 android:id="@+id/reading_feed_icon"
diff --git a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
index a2836f3aa..0aca746b6 100644
--- a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
@@ -84,11 +84,11 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentTop="true"
-        style="?folderBorderTop" />
+        style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        style="?folderBorderBottom" />
+        style="?rowBorderBottom" />
 
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/row_all_stories.xml b/clients/android/NewsBlur/res/layout/row_all_stories.xml
index ff8118b00..dc41f01e2 100644
--- a/clients/android/NewsBlur/res/layout/row_all_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_stories.xml
@@ -30,11 +30,11 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentTop="true"
-        style="?folderBorderTop" />
+        style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        style="?folderBorderBottom" />
+        style="?rowBorderBottom" />
 
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/row_folder.xml b/clients/android/NewsBlur/res/layout/row_folder.xml
index 40cf8648c..4636522ee 100644
--- a/clients/android/NewsBlur/res/layout/row_folder.xml
+++ b/clients/android/NewsBlur/res/layout/row_folder.xml
@@ -89,12 +89,12 @@
     <View 
         android:layout_height="1dp"
         android:layout_width="match_parent"
-        style="?folderBorderTop"
+        style="?rowBorderTop"
         android:layout_alignParentTop="true" />
     <View 
         android:layout_height="1dp"
         android:layout_width="match_parent"
-        style="?folderBorderBottom"
+        style="?rowBorderBottom"
         android:layout_alignParentBottom="true" />
    
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml b/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml
index 8e6885400..34a7d4e94 100644
--- a/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml
@@ -30,11 +30,11 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentTop="true"
-        style="?folderBorderTop" />
+        style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        style="?folderBorderBottom" />
+        style="?rowBorderBottom" />
 
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/row_read_stories.xml b/clients/android/NewsBlur/res/layout/row_read_stories.xml
index 1af7a83ac..cd316486e 100644
--- a/clients/android/NewsBlur/res/layout/row_read_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_read_stories.xml
@@ -30,11 +30,11 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentTop="true"
-        style="?folderBorderTop" />
+        style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        style="?folderBorderBottom" />
+        style="?rowBorderBottom" />
 
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/row_saved_stories.xml b/clients/android/NewsBlur/res/layout/row_saved_stories.xml
index fcfeee864..6b26f8f5e 100644
--- a/clients/android/NewsBlur/res/layout/row_saved_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_saved_stories.xml
@@ -60,11 +60,11 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentTop="true"
-        style="?folderBorderTop" />
+        style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        style="?folderBorderBottom" />
+        style="?rowBorderBottom" />
 
 </RelativeLayout>
diff --git a/clients/android/NewsBlur/res/layout/row_story.xml b/clients/android/NewsBlur/res/layout/row_story.xml
index 276332cfa..94076d0da 100644
--- a/clients/android/NewsBlur/res/layout/row_story.xml
+++ b/clients/android/NewsBlur/res/layout/row_story.xml
@@ -125,6 +125,17 @@
         android:singleLine="true"
         android:textColor="@color/story_author_text" />
 
+    <View 
+        android:layout_height="0.5dp"
+        android:layout_width="match_parent"
+        style="?rowBorderTop"
+        android:layout_alignParentTop="true" />
+    <View 
+        android:layout_height="0.5dp"
+        android:layout_width="match_parent"
+        style="?rowBorderBottom"
+        android:layout_alignParentBottom="true" />
+
 </RelativeLayout>
 
 </LinearLayout>
diff --git a/clients/android/NewsBlur/res/values/attrs.xml b/clients/android/NewsBlur/res/values/attrs.xml
index 991fbfe40..4b1e5c29f 100644
--- a/clients/android/NewsBlur/res/values/attrs.xml
+++ b/clients/android/NewsBlur/res/values/attrs.xml
@@ -16,7 +16,6 @@
     <attr name="storyFeedTitleText" format="string" />
     <attr name="selectorStoryBackground" format="string" />
     <attr name="rowItemHeaderBackground" format="string" />
-    <attr name="rowItemFeedHeader" format="string" />
     <attr name="readingItemMetadata" format="string" />
     <attr name="tag" format="string" />
     <attr name="actionButtons" format="string" />
@@ -24,8 +23,8 @@
     <attr name="shareBarBackground" format="string" />
     <attr name="shareBarText" format="string" />
     <attr name="commentsHeader" format="string" />
-    <attr name="folderBorderTop" format="string" />
-    <attr name="folderBorderBottom" format="string" />
+    <attr name="rowBorderTop" format="string" />
+    <attr name="rowBorderBottom" format="string" />
     <attr name="divider" format="string" />
     <attr name="profileCount" format="string" />
     <attr name="profileActivityList" format="string" />
diff --git a/clients/android/NewsBlur/res/values/colors.xml b/clients/android/NewsBlur/res/values/colors.xml
index cfe75fff0..884b76b4a 100644
--- a/clients/android/NewsBlur/res/values/colors.xml
+++ b/clients/android/NewsBlur/res/values/colors.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="white">#FFF</color>
+    <color name="black">#000000</color>
+    <color name="gray07">#121212</color>
+    <color name="gray10">#1A1A1A</color>
     <color name="gray13">#212121</color>
     <color name="gray20">#333333</color>
     <color name="gray30">#4D4D4D</color>
@@ -11,12 +13,13 @@
     <color name="gray75">#BFBFBF</color>
     <color name="gray80">#CCCCCC</color>
     <color name="gray90">#E6E6E6</color>
-    <color name="black">#000000</color>
+    <color name="gray96">#F4F4F4</color>
+    <color name="white">#FFF</color>
     <color name="transparent">#00000000</color>
 
-    <color name="nb_gren_gray91">#E4E7E1</color>
+    <color name="nb_green_gray91">#E4E7E1</color>
 
-    <color name="bar_background">@color/nb_gren_gray91</color>
+    <color name="bar_background">@color/nb_green_gray91</color>
     <color name="dark_bar_background">@color/gray13</color>
 
     <color name="text">@color/gray20</color>
@@ -31,28 +34,23 @@
 
     <color name="folder_background_end">#E9EBE4</color>
     <color name="folder_background_start">#DDE0D7</color>
-    <color name="dark_folder_background_end">#1A1A1A</color>
-    <color name="dark_folder_background_start">#212121</color>
+    <color name="dark_folder_background_end">@color/gray07</color>
+    <color name="dark_folder_background_start">@color/gray13</color>
     <color name="folder_background_selected_end">#D9DBD4</color>
     <color name="folder_background_selected_start">#CDD0C7</color>
     <color name="dark_folder_background_selected_end">#4C4C4C</color>
     <color name="dark_folder_background_selected_start">#1A1A1A</color>
-    <color name="folder_border_top">#FDFDFD</color>
-    <color name="folder_border_bottom">#B7BBAA</color>
-    <color name="dark_folder_border_top">#434343</color>
-    <color name="dark_folder_border_bottom">#3B3B3B</color>
-    <color name="feed_background">#F7F8F5</color>
-    <color name="feed_background_end">#303030</color>
-    <color name="feed_background_start">#505050</color>
-    <color name="dark_feed_background_end">#303030</color>
-    <color name="dark_feed_background_start">#505050</color>
+    <color name="row_border_top">@color/white</color>
+    <color name="row_border_bottom">@color/gray80</color>
+    <color name="dark_row_border_top">@color/gray20</color>
+    <color name="dark_row_border_bottom">@color/gray13</color>
     <color name="feed_background_selected_end">#FFFFD2</color>
     <color name="feed_background_selected_start">#E3D0AE</color>
     <color name="dark_feed_background_selected_end">#4C4C4C</color>
     <color name="dark_feed_background_selected_start">#1A1A1A</color>
-    <color name="story_background">#F4F4F4</color>
+    <color name="story_background">@color/gray96</color>
     <color name="story_background_selected">#FFFDEF</color>
-    <color name="dark_story_background">#1A1A1A</color>
+    <color name="dark_story_background">@color/gray07</color>
     <color name="dark_story_background_selected">#4C4C4C</color>
 
     <color name="story_feed_title_text">#606060</color>
diff --git a/clients/android/NewsBlur/res/values/styles.xml b/clients/android/NewsBlur/res/values/styles.xml
index 620707fd1..4985639ed 100644
--- a/clients/android/NewsBlur/res/values/styles.xml
+++ b/clients/android/NewsBlur/res/values/styles.xml
@@ -137,13 +137,6 @@
         <item name="android:background">@drawable/dark_row_item_header_background</item>
     </style>
 
-    <style name="rowItemFeedHeader">
-      <item name="android:background">@drawable/row_item_feed_header</item>
-    </style>
-    <style name="rowItemFeedHeader.dark">
-        <item name="android:background">@drawable/dark_row_item_feed_header</item>
-    </style>
-
     <style name="readingItemMetadata">
         <item name="android:textColor">@color/half_darkgray</item>
     </style>
@@ -227,25 +220,18 @@
         <item name="android:textColor">@color/dark_text</item>
     </style>
 
-    <style name="folderBorderTop">
-        <item name="android:background">@color/folder_border_top</item>
+    <style name="rowBorderTop">
+        <item name="android:background">@color/row_border_top</item>
     </style>
-    <style name="folderBorderTop.dark">
-        <item name="android:background">@color/dark_folder_border_top</item>
+    <style name="rowBorderTop.dark">
+        <item name="android:background">@color/dark_row_border_top</item>
     </style>
 
-    <style name="folderBorderBottom">
-        <item name="android:background">@color/folder_border_bottom</item>
+    <style name="rowBorderBottom">
+        <item name="android:background">@color/row_border_bottom</item>
     </style>
-    <style name="folderBorderBottom.dark">
-        <item name="android:background">@color/dark_folder_border_bottom</item>
-    </style>
-
-    <style name="divider">
-        <item name="android:divider">@drawable/divider_light</item>
-    </style>
-    <style name="divider.dark">
-        <item name="android:divider">@drawable/divider_dark</item>
+    <style name="rowBorderBottom.dark">
+        <item name="android:background">@color/dark_row_border_bottom</item>
     </style>
 
     <style name="profileCount">
diff --git a/clients/android/NewsBlur/res/values/theme.xml b/clients/android/NewsBlur/res/values/theme.xml
index a14636356..2cc4a18c9 100644
--- a/clients/android/NewsBlur/res/values/theme.xml
+++ b/clients/android/NewsBlur/res/values/theme.xml
@@ -17,7 +17,6 @@
         <item name="storyFeedTitleText">@style/storyFeedTitleText</item>
         <item name="selectorStoryBackground">@style/selectorStoryBackground</item>
         <item name="rowItemHeaderBackground">@style/rowItemHeaderBackground</item>
-        <item name="rowItemFeedHeader">@style/rowItemFeedHeader</item>
         <item name="readingItemMetadata">@style/readingItemMetadata</item>
         <item name="tag">@style/tag</item>
         <item name="actionButtons">@style/actionButtons</item>
@@ -25,9 +24,8 @@
         <item name="shareBarBackground">@style/shareBarBackground</item>
         <item name="shareBarText">@style/shareBarText</item>
         <item name="commentsHeader">@style/commentsHeader</item>
-        <item name="folderBorderTop">@style/folderBorderTop</item>
-        <item name="folderBorderBottom">@style/folderBorderBottom</item>
-        <item name="divider">@style/divider</item>
+        <item name="rowBorderTop">@style/rowBorderTop</item>
+        <item name="rowBorderBottom">@style/rowBorderBottom</item>
         <item name="profileCount">@style/profileCount</item>
         <item name="profileActivityList">@style/profileActivityList</item>
         <item name="itemHeaderDivider">@style/itemHeaderDivider</item>
@@ -60,7 +58,6 @@
         <item name="storyFeedTitleText">@style/storyFeedTitleText.dark</item>
         <item name="selectorStoryBackground">@style/selectorStoryBackground.dark</item>
         <item name="rowItemHeaderBackground">@style/rowItemHeaderBackground.dark</item>
-        <item name="rowItemFeedHeader">@style/rowItemFeedHeader.dark</item>
         <item name="readingItemMetadata">@style/readingItemMetadata.dark</item>
         <item name="tag">@style/tag.dark</item>
         <item name="actionButtons">@style/actionButtons.dark</item>
@@ -68,9 +65,8 @@
         <item name="shareBarBackground">@style/shareBarBackground.dark</item>
         <item name="shareBarText">@style/shareBarText.dark</item>
         <item name="commentsHeader">@style/commentsHeader.dark</item>
-        <item name="folderBorderTop">@style/folderBorderTop.dark</item>
-        <item name="folderBorderBottom">@style/folderBorderBottom.dark</item>
-        <item name="divider">@style/divider.dark</item>
+        <item name="rowBorderTop">@style/rowBorderTop.dark</item>
+        <item name="rowBorderBottom">@style/rowBorderBottom.dark</item>
         <item name="profileCount">@style/profileCount.dark</item>
         <item name="profileActivityList">@style/profileActivityList.dark</item>
         <item name="itemHeaderDivider">@style/itemHeaderDivider.dark</item>
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
index 9207c3006..813480575 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
@@ -94,7 +94,6 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
                                      UIUtils.getColor(getActivity(), R.color.refresh_3),
                                      UIUtils.getColor(getActivity(), R.color.refresh_4));
         itemList.addHeaderView(headerView, null, false);
-        itemList.setHeaderDividersEnabled(false);
 
         View footerView = inflater.inflate(R.layout.row_loading_throbber, null);
         footerProgressView = (ProgressThrobber) footerView.findViewById(R.id.itemlist_loading_throb);
@@ -104,7 +103,6 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
                                      UIUtils.getColor(getActivity(), R.color.refresh_3),
                                      UIUtils.getColor(getActivity(), R.color.refresh_4));
         itemList.addFooterView(footerView, null, false);
-        itemList.setFooterDividersEnabled(false);
 
         fleuronFooter = inflater.inflate(R.layout.row_fleuron, null);
         fleuronFooter.setVisibility(View.GONE);

From 1ac763e29453de8f4e3d7c214ab0aaeaa6777541 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 2 Nov 2016 17:56:08 -0700
Subject: [PATCH 13/21] iOS v6.1.1.

---
 clients/ios/Classes/NewsBlurViewController.m   |  2 ++
 clients/ios/NewsBlur-iPhone-Info.plist         |  4 ++--
 clients/ios/NewsBlur.xcodeproj/project.pbxproj | 18 +++++++++---------
 config/mongodb.dev.conf                        |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/clients/ios/Classes/NewsBlurViewController.m b/clients/ios/Classes/NewsBlurViewController.m
index bcc17d1ca..994923e56 100644
--- a/clients/ios/Classes/NewsBlurViewController.m
+++ b/clients/ios/Classes/NewsBlurViewController.m
@@ -2124,6 +2124,7 @@ heightForHeaderInSection:(NSInteger)section {
     self.notifier.title = @"Counting is difficult...";
     [self.notifier setProgress:0];
     [self.notifier show];
+    [self finishRefresh];
 }
 
 - (void)showSyncingNotifier {
@@ -2131,6 +2132,7 @@ heightForHeaderInSection:(NSInteger)section {
     self.notifier.title = @"Syncing stories...";
     [self.notifier setProgress:0];
     [self.notifier show];
+    [self finishRefresh];
 }
 
 - (void)showDoneNotifier {
diff --git a/clients/ios/NewsBlur-iPhone-Info.plist b/clients/ios/NewsBlur-iPhone-Info.plist
index c923d810a..fc284431e 100644
--- a/clients/ios/NewsBlur-iPhone-Info.plist
+++ b/clients/ios/NewsBlur-iPhone-Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.1.0</string>
+	<string>6.1.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -58,7 +58,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>67</string>
+	<string>68</string>
 	<key>FacebookAppID</key>
 	<string>230426707030569</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
diff --git a/clients/ios/NewsBlur.xcodeproj/project.pbxproj b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
index 9ee876adb..8482053c2 100755
--- a/clients/ios/NewsBlur.xcodeproj/project.pbxproj
+++ b/clients/ios/NewsBlur.xcodeproj/project.pbxproj
@@ -2436,7 +2436,7 @@
 				TargetAttributes = {
 					1D6058900D05DD3D006BFB54 = {
 						DevelopmentTeam = HR7P97SD72;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
@@ -3051,9 +3051,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = HR7P97SD72;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -3081,8 +3081,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.newsblur.NewsBlur;
 				PRODUCT_NAME = NewsBlur;
-				PROVISIONING_PROFILE = "a33bf1f3-82b0-4761-a144-cb612ef478e9";
-				PROVISIONING_PROFILE_SPECIFIER = "NewsBlur App Store";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				STRIP_INSTALLED_PRODUCT = NO;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				"WARNING_CFLAGS[arch=*]" = "-Wall";
@@ -3096,9 +3096,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_OBJC_ARC = YES;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
-				DEVELOPMENT_TEAM = HR7P97SD72;
+				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)",
@@ -3124,8 +3124,8 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.newsblur.NewsBlur;
 				PRODUCT_NAME = NewsBlur;
-				PROVISIONING_PROFILE = "a33bf1f3-82b0-4761-a144-cb612ef478e9";
-				PROVISIONING_PROFILE_SPECIFIER = "NewsBlur App Store";
+				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
diff --git a/config/mongodb.dev.conf b/config/mongodb.dev.conf
index 5697c1fbc..828479576 100644
--- a/config/mongodb.dev.conf
+++ b/config/mongodb.dev.conf
@@ -85,6 +85,6 @@ verbose = true
 #source = slave.example.com
 
 # in replica set configuration, specify the name of the replica set
-replSet = nbset 
+# replSet = nbset
 
 journal = true

From 1454da0b43536355f3fb56fb8832f115b45ea042 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Wed, 2 Nov 2016 22:07:10 -0700
Subject: [PATCH 14/21] Fixing tlnb

---
 templates/maintenance_off.html | 2 +-
 utils/tlnb.py                  | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/templates/maintenance_off.html b/templates/maintenance_off.html
index fa3e9eaba..3022d042a 100644
--- a/templates/maintenance_off.html
+++ b/templates/maintenance_off.html
@@ -85,7 +85,7 @@
                         <img src="/media/img/logo_512.png" class="logo">
                         <h1>NewsBlur is in <span class="error404">maintenance mode</span></h1>
                         <div class="description">
-                            <p>Moving to a new primary MongoDB database server. This server has been the cause of all the 1 minute downtimes over the past couple days. This should take 5 minutes max.</p>
+                            <p>Moving to a new primary MongoDB database server. This server has been the cause of the slowdowns over the past couple days. This should take 5 minutes max.</p>
                             <p>To pass the time, <a href="http://mlkshk.com/popular">check out what's popular on MLKSHK</a>.</p>
                         </div>
                     </div>
diff --git a/utils/tlnb.py b/utils/tlnb.py
index 0d891b9c5..8317f17f0 100755
--- a/utils/tlnb.py
+++ b/utils/tlnb.py
@@ -97,7 +97,10 @@ def read_streams(streams):
                 if not data:
                     streams.remove(stream)
                     break
-                combination_message = "[%-6s] %s" % (stream.name[:6], data)
+                try:
+                    combination_message = "[%-6s] %s" % (stream.name[:6], data)
+                except UnicodeDecodeError:
+                    continue
                 sys.stdout.write(combination_message)
                 break
 

From 8abd460d1819812d07b4fb067304d315f9e4fe2e Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 3 Nov 2016 03:52:52 -0700
Subject: [PATCH 15/21] fix border weighting on folder rows

---
 .../android/NewsBlur/res/layout/row_all_shared_stories.xml    | 4 ++--
 clients/android/NewsBlur/res/layout/row_all_stories.xml       | 4 ++--
 clients/android/NewsBlur/res/layout/row_folder.xml            | 4 ++--
 .../android/NewsBlur/res/layout/row_global_shared_stories.xml | 4 ++--
 clients/android/NewsBlur/res/layout/row_read_stories.xml      | 4 ++--
 clients/android/NewsBlur/res/layout/row_saved_stories.xml     | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
index 0aca746b6..50d09072f 100644
--- a/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_shared_stories.xml
@@ -82,12 +82,12 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentTop="true"
         style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentBottom="true"
         style="?rowBorderBottom" />
 
diff --git a/clients/android/NewsBlur/res/layout/row_all_stories.xml b/clients/android/NewsBlur/res/layout/row_all_stories.xml
index dc41f01e2..da0df5925 100644
--- a/clients/android/NewsBlur/res/layout/row_all_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_stories.xml
@@ -28,12 +28,12 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentTop="true"
         style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentBottom="true"
         style="?rowBorderBottom" />
 
diff --git a/clients/android/NewsBlur/res/layout/row_folder.xml b/clients/android/NewsBlur/res/layout/row_folder.xml
index 4636522ee..7ed404967 100644
--- a/clients/android/NewsBlur/res/layout/row_folder.xml
+++ b/clients/android/NewsBlur/res/layout/row_folder.xml
@@ -87,12 +87,12 @@
         android:ellipsize="end" />
     
     <View 
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_width="match_parent"
         style="?rowBorderTop"
         android:layout_alignParentTop="true" />
     <View 
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_width="match_parent"
         style="?rowBorderBottom"
         android:layout_alignParentBottom="true" />
diff --git a/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml b/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml
index 34a7d4e94..1635ac2da 100644
--- a/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_global_shared_stories.xml
@@ -28,12 +28,12 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentTop="true"
         style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentBottom="true"
         style="?rowBorderBottom" />
 
diff --git a/clients/android/NewsBlur/res/layout/row_read_stories.xml b/clients/android/NewsBlur/res/layout/row_read_stories.xml
index cd316486e..95bc5bdcc 100644
--- a/clients/android/NewsBlur/res/layout/row_read_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_read_stories.xml
@@ -28,12 +28,12 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentTop="true"
         style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentBottom="true"
         style="?rowBorderBottom" />
 
diff --git a/clients/android/NewsBlur/res/layout/row_saved_stories.xml b/clients/android/NewsBlur/res/layout/row_saved_stories.xml
index 6b26f8f5e..6339479d3 100644
--- a/clients/android/NewsBlur/res/layout/row_saved_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_saved_stories.xml
@@ -58,12 +58,12 @@
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentTop="true"
         style="?rowBorderTop" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="0.5dp"
         android:layout_alignParentBottom="true"
         style="?rowBorderBottom" />
 

From 006374268958c04073a861e4d34341e43cd03d73 Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 3 Nov 2016 08:10:17 -0700
Subject: [PATCH 16/21] basic configurable story title gestures (#496)

---
 .../android/NewsBlur/res/values/strings.xml   |  31 +++++
 .../NewsBlur/res/xml/activity_settings.xml    |  18 +++
 .../newsblur/fragment/ItemListFragment.java   | 106 +++++++++++++++---
 .../src/com/newsblur/util/GestureAction.java  |   9 ++
 .../src/com/newsblur/util/PrefConstants.java  |   3 +
 .../src/com/newsblur/util/PrefsUtils.java     |  10 ++
 6 files changed, 159 insertions(+), 18 deletions(-)
 create mode 100644 clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java

diff --git a/clients/android/NewsBlur/res/values/strings.xml b/clients/android/NewsBlur/res/values/strings.xml
index 2ee8acb2e..efd93ffd9 100644
--- a/clients/android/NewsBlur/res/values/strings.xml
+++ b/clients/android/NewsBlur/res/values/strings.xml
@@ -258,6 +258,8 @@
     </string-array>
     <string name="default_theme_value">light</string>
 
+    <string name="settings_gestures">Gestures</string>
+
     <string name="sync_status_housekeeping">Tidying up...</string>
     <string name="sync_status_actions">Catching up %d reading actions...</string>
     <string name="sync_status_recounts">Catching up reading actions...</string>
@@ -300,4 +302,33 @@
         <item>NONE</item>
     </string-array>
     <string name="confirm_mark_all_read_value">FOLDER_ONLY</string>
+
+    <string name="settings_ltr_gesture_action">Rightward Swipe on Story Title</string>
+    <string name="gest_action_none">No Action</string>
+    <string name="gest_action_markread">Mark Story Read</string>
+    <string name="gest_action_markunread">Mark Story Unread</string>
+    <string-array name="ltr_gesture_action_entries">
+        <item>@string/gest_action_none</item>
+        <item>@string/gest_action_markread</item>
+        <item>@string/gest_action_markunread</item>
+    </string-array>
+    <string-array name="ltr_gesture_action_values">
+        <item>GEST_ACTION_NONE</item>
+        <item>GEST_ACTION_MARKREAD</item>
+        <item>GEST_ACTION_MARKUNREAD</item>
+    </string-array>
+    <string name="ltr_gesture_action_value">GEST_ACTION_MARKREAD</string>
+
+    <string name="settings_rtl_gesture_action">Leftward Swipe on Story Title</string>
+    <string-array name="rtl_gesture_action_entries">
+        <item>@string/gest_action_none</item>
+        <item>@string/gest_action_markread</item>
+        <item>@string/gest_action_markunread</item>
+    </string-array>
+    <string-array name="rtl_gesture_action_values">
+        <item>GEST_ACTION_NONE</item>
+        <item>GEST_ACTION_MARKREAD</item>
+        <item>GEST_ACTION_MARKUNREAD</item>
+    </string-array>
+    <string name="rtl_gesture_action_value">GEST_ACTION_MARKUNREAD</string>
 </resources>
diff --git a/clients/android/NewsBlur/res/xml/activity_settings.xml b/clients/android/NewsBlur/res/xml/activity_settings.xml
index 0e758e967..830c8fb24 100644
--- a/clients/android/NewsBlur/res/xml/activity_settings.xml
+++ b/clients/android/NewsBlur/res/xml/activity_settings.xml
@@ -103,4 +103,22 @@
             android:defaultValue="@string/default_theme_value" />
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="@string/settings_gestures">
+        <ListPreference
+            android:key="ltr_gesture_action"
+            android:title="@string/settings_ltr_gesture_action"
+            android:dialogTitle="@string/settings_ltr_gesture_action"
+            android:entries="@array/ltr_gesture_action_entries"
+            android:entryValues="@array/ltr_gesture_action_values"
+            android:defaultValue="@string/ltr_gesture_action_value" />
+        <ListPreference
+            android:key="rtl_gesture_action"
+            android:title="@string/settings_rtl_gesture_action"
+            android:dialogTitle="@string/settings_rtl_gesture_action"
+            android:entries="@array/rtl_gesture_action_entries"
+            android:entryValues="@array/rtl_gesture_action_values"
+            android:defaultValue="@string/rtl_gesture_action_value" />
+    </PreferenceCategory>
+
 </PreferenceScreen>
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
index 813480575..3b8dc09c2 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
@@ -37,6 +37,7 @@ import com.newsblur.service.NBSyncService;
 import com.newsblur.util.DefaultFeedView;
 import com.newsblur.util.FeedSet;
 import com.newsblur.util.FeedUtils;
+import com.newsblur.util.GestureAction;
 import com.newsblur.util.PrefsUtils;
 import com.newsblur.util.ReadFilter;
 import com.newsblur.util.StoryOrder;
@@ -64,6 +65,13 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
 
     private View fleuronFooter;
 
+    // row index of the last story to get a LTR gesture or -1 if none
+    private int gestureLeftToRightFlag = -1;
+    // row index of the last story to get a RTL gesture or -1 if none
+    private int gestureRightToLeftFlag = -1;
+    // flag indicating a gesture just occurred so we can ignore spurious story taps right after
+    private boolean gestureDebounce = false;
+
     @Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -109,7 +117,7 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
         itemList.addFooterView(fleuronFooter, null, false);
 
 		itemList.setEmptyView(v.findViewById(R.id.empty_view));
-        setupBezelSwipeDetector(itemList);
+        setupGestureDetector(itemList);
         itemList.setOnScrollListener(this);
 		itemList.setOnItemClickListener(this);
         itemList.setOnCreateContextMenuListener(this);
@@ -280,6 +288,10 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
 
     @Override
     public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
+        // context menu like to get accidentally triggered by the ListView event handler right after
+        // we detect a gesure.  if so, let the gesture happen rather than popping up the menu
+        if ((gestureLeftToRightFlag > -1) || (gestureRightToLeftFlag > -1)) return;
+
         MenuInflater inflater = getActivity().getMenuInflater();
         if (PrefsUtils.getStoryOrder(activity, getFeedSet()) == StoryOrder.NEWEST) {
             inflater.inflate(R.menu.context_story_newest, menu);
@@ -353,6 +365,14 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
 
 	@Override
 	public synchronized void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        // clicks like to get accidentally triggered by the ListView event handler right after we detect
+        // a gesture. if so, let the gesture happen rather than popping up the menu
+        if (gestureDebounce){
+            gestureDebounce = false;
+            return;
+        }
+        if ((gestureLeftToRightFlag > -1) || (gestureRightToLeftFlag > -1)) return;
+
         int truePosition = position - 1;
         Story story = adapter.getStory(truePosition);
         if (getActivity().isFinishing()) return;
@@ -364,36 +384,86 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
             adapter.setTextSize(size);
             adapter.notifyDataSetChanged();
         }
-
     }
 
-    protected void setupBezelSwipeDetector(View v) {
-        final GestureDetector gestureDetector = new GestureDetector(getActivity(), new BezelSwipeDetector());
+    protected void setupGestureDetector(View v) {
+        final GestureDetector gestureDetector = new GestureDetector(getActivity(), new ItemListGestureDetector());
         v.setOnTouchListener(new OnTouchListener() {
             public boolean onTouch(View v, MotionEvent event) {
-                return gestureDetector.onTouchEvent(event);
+                boolean result =  gestureDetector.onTouchEvent(event);
+                if (event.getActionMasked() == MotionEvent.ACTION_UP) {
+                    ItemListFragment.this.flushGesture();
+                }
+                return result;
             }
         });
     }
 
-    /**
-     * A gesture detector that captures bezel swipes and finishes the activity,
-     * to simulate a 'back' gesture.
-     *
-     * NB: pretty much all Views still try to process on-tap events despite
-     *     returning true, so be sure to check isFinishing() on all other
-     *     tap handlers.
-     */
-    class BezelSwipeDetector extends GestureDetector.SimpleOnGestureListener {
+    protected void gestureLeftToRight(float x, float y) {
+        int index = itemList.pointToPosition((int) x, (int) y);
+        gestureLeftToRightFlag = index;
+    }
+
+    protected void gestureRightToLeft(float x, float y) {
+        int index = itemList.pointToPosition((int) x, (int) y);
+        gestureRightToLeftFlag = index;
+    }
+
+    // the above gesture* methods will trigger more than once while being performed. it is not until
+    // the up-event that we look to see if any happened, and if so, take action and flush.
+    protected void flushGesture() {
+        int index = -1;
+        GestureAction action = GestureAction.GEST_ACTION_NONE;
+        if (gestureLeftToRightFlag > -1) {
+            index = gestureLeftToRightFlag;
+            action = PrefsUtils.getLeftToRightGestureAction(getActivity());
+            gestureLeftToRightFlag = -1;
+            gestureDebounce = true;
+        }
+        if (gestureRightToLeftFlag > -1) {
+            index = gestureRightToLeftFlag;
+            action = PrefsUtils.getRightToLeftGestureAction(getActivity());
+            gestureRightToLeftFlag = -1;
+            gestureDebounce = true;
+        }
+        if (index <= -1) return;
+        Story story = adapter.getStory(index-1);
+        switch (action) {
+            case GEST_ACTION_MARKREAD:
+                FeedUtils.markStoryAsRead(story, getActivity());;
+                break;
+            case GEST_ACTION_MARKUNREAD:
+                FeedUtils.markStoryUnread(story, getActivity());;
+                break;
+            case GEST_ACTION_NONE:
+            default:
+        }
+    }
+
+    class ItemListGestureDetector extends GestureDetector.SimpleOnGestureListener {
         @Override
         public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-            if((e1.getX() < 75f) &&                  // the gesture should start from the left bezel and
-               ((e2.getX()-e1.getX()) > 90f) &&      // move horizontally to the right and
-               (Math.abs(e1.getY()-e2.getY()) < 40f) // have minimal vertical travel, so we don't capture scrolling gestures
-               ) {
+            if ((e1.getX() < 75f) &&                  // the gesture should start from the left bezel and
+                ((e2.getX()-e1.getX()) > 90f) &&      // move horizontally to the right and
+                (Math.abs(e1.getY()-e2.getY()) < 40f) // have minimal vertical travel, so we don't capture scrolling gestures
+                ) {
                 ItemListFragment.this.getActivity().finish();
                 return true;
             }
+            if ((e1.getX() > 75f) &&                  // the gesture should not start from the left bezel and
+                ((e2.getX()-e1.getX()) > 120f) &&     // move horizontally to the right and
+                (Math.abs(e1.getY()-e2.getY()) < 40f) // have minimal vertical travel, so we don't capture scrolling gestures
+                ) {
+                ItemListFragment.this.gestureLeftToRight(e1.getX(), e1.getY());
+                return true;
+            }
+            if ((e1.getX() > 75f) &&                  // the gesture should not start from the left bezel and
+                ((e1.getX()-e2.getX()) > 120f) &&     // move horizontally to the left and
+                (Math.abs(e1.getY()-e2.getY()) < 40f) // have minimal vertical travel, so we don't capture scrolling gestures
+                ) {
+                ItemListFragment.this.gestureRightToLeft(e1.getX(), e1.getY());
+                return true;
+            }
             return false;
         }
     }
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java b/clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java
new file mode 100644
index 000000000..acb3b7927
--- /dev/null
+++ b/clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java
@@ -0,0 +1,9 @@
+package com.newsblur.util;
+
+public enum GestureAction {
+
+    GEST_ACTION_NONE,
+    GEST_ACTION_MARKREAD,
+    GEST_ACTION_MARKUNREAD;
+
+}
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
index d66a0039e..fb8accc9a 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefConstants.java
@@ -72,4 +72,7 @@ public class PrefConstants {
 
     public static final String VOLUME_KEY_NAVIGATION = "volume_key_navigation";
     public static final String MARK_ALL_READ_CONFIRMATION = "pref_confirm_mark_all_read";
+
+    public static final String LTR_GESTURE_ACTION = "ltr_gesture_action";
+    public static final String RTL_GESTURE_ACTION = "rtl_gesture_action";
 }
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
index 4050790b7..f8a84a71d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/PrefsUtils.java
@@ -599,4 +599,14 @@ public class PrefsUtils {
         SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
         return MarkAllReadConfirmation.valueOf(prefs.getString(PrefConstants.MARK_ALL_READ_CONFIRMATION, MarkAllReadConfirmation.FOLDER_ONLY.toString()));
     }
+
+    public static GestureAction getLeftToRightGestureAction(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
+        return GestureAction.valueOf(prefs.getString(PrefConstants.LTR_GESTURE_ACTION, GestureAction.GEST_ACTION_MARKREAD.toString()));
+    }
+
+    public static GestureAction getRightToLeftGestureAction(Context context) {
+        SharedPreferences prefs = context.getSharedPreferences(PrefConstants.PREFERENCES, 0);
+        return GestureAction.valueOf(prefs.getString(PrefConstants.RTL_GESTURE_ACTION, GestureAction.GEST_ACTION_MARKUNREAD.toString()));
+    }
 }

From 7394b1e5ff1258e5580af0eef2f4f8b6b9d287ed Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 3 Nov 2016 08:20:59 -0700
Subject: [PATCH 17/21] add save/unsave support for gestures (#496)

---
 clients/android/NewsBlur/res/values/strings.xml        | 10 ++++++++++
 .../src/com/newsblur/fragment/ItemListFragment.java    |  6 ++++++
 .../NewsBlur/src/com/newsblur/util/GestureAction.java  |  4 +++-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/clients/android/NewsBlur/res/values/strings.xml b/clients/android/NewsBlur/res/values/strings.xml
index efd93ffd9..af6d4a1e6 100644
--- a/clients/android/NewsBlur/res/values/strings.xml
+++ b/clients/android/NewsBlur/res/values/strings.xml
@@ -307,15 +307,21 @@
     <string name="gest_action_none">No Action</string>
     <string name="gest_action_markread">Mark Story Read</string>
     <string name="gest_action_markunread">Mark Story Unread</string>
+    <string name="gest_action_save">Save Story</string>
+    <string name="gest_action_unsave">Unsave Story</string>
     <string-array name="ltr_gesture_action_entries">
         <item>@string/gest_action_none</item>
         <item>@string/gest_action_markread</item>
         <item>@string/gest_action_markunread</item>
+        <item>@string/gest_action_save</item>
+        <item>@string/gest_action_unsave</item>
     </string-array>
     <string-array name="ltr_gesture_action_values">
         <item>GEST_ACTION_NONE</item>
         <item>GEST_ACTION_MARKREAD</item>
         <item>GEST_ACTION_MARKUNREAD</item>
+        <item>GEST_ACTION_SAVE</item>
+        <item>GEST_ACTION_UNSAVE</item>
     </string-array>
     <string name="ltr_gesture_action_value">GEST_ACTION_MARKREAD</string>
 
@@ -324,11 +330,15 @@
         <item>@string/gest_action_none</item>
         <item>@string/gest_action_markread</item>
         <item>@string/gest_action_markunread</item>
+        <item>@string/gest_action_save</item>
+        <item>@string/gest_action_unsave</item>
     </string-array>
     <string-array name="rtl_gesture_action_values">
         <item>GEST_ACTION_NONE</item>
         <item>GEST_ACTION_MARKREAD</item>
         <item>GEST_ACTION_MARKUNREAD</item>
+        <item>GEST_ACTION_SAVE</item>
+        <item>GEST_ACTION_UNSAVE</item>
     </string-array>
     <string name="rtl_gesture_action_value">GEST_ACTION_MARKUNREAD</string>
 </resources>
diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
index 3b8dc09c2..24fe5f482 100644
--- a/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
+++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ItemListFragment.java
@@ -435,6 +435,12 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
             case GEST_ACTION_MARKUNREAD:
                 FeedUtils.markStoryUnread(story, getActivity());;
                 break;
+            case GEST_ACTION_SAVE:
+                FeedUtils.setStorySaved(story, true, getActivity());;
+                break;
+            case GEST_ACTION_UNSAVE:
+                FeedUtils.setStorySaved(story, false, getActivity());;
+                break;
             case GEST_ACTION_NONE:
             default:
         }
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java b/clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java
index acb3b7927..b39c0b9e2 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/GestureAction.java
@@ -4,6 +4,8 @@ public enum GestureAction {
 
     GEST_ACTION_NONE,
     GEST_ACTION_MARKREAD,
-    GEST_ACTION_MARKUNREAD;
+    GEST_ACTION_MARKUNREAD,
+    GEST_ACTION_SAVE,
+    GEST_ACTION_UNSAVE;
 
 }

From 10c914d0fd6a2b2be79bf10422284f02c14284cd Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 3 Nov 2016 08:36:17 -0700
Subject: [PATCH 18/21] fix ANR when marking huge folders

---
 clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java  | 3 ---
 .../android/NewsBlur/src/com/newsblur/util/ReadingAction.java  | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
index a43a8e113..e0380ed8e 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
@@ -157,9 +157,6 @@ public class FeedUtils {
     }
 
     public static void markFeedsRead(final FeedSet fs, final Long olderThan, final Long newerThan, final Context context) {
-        dbHelper.markStoriesRead(fs, olderThan, newerThan);
-        dbHelper.updateLocalFeedCounts(fs);
-        NbActivity.updateAllActivities(NbActivity.UPDATE_METADATA | NbActivity.UPDATE_STORY);
         new AsyncTask<Void, Void, Void>() {
             @Override
             protected Void doInBackground(Void... arg) {
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/ReadingAction.java b/clients/android/NewsBlur/src/com/newsblur/util/ReadingAction.java
index 2953b7404..f6a39c085 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/ReadingAction.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/ReadingAction.java
@@ -304,6 +304,7 @@ public class ReadingAction {
                     dbHelper.setStoryReadState(storyHash, true);
                 } else if (feedSet != null) {
                     dbHelper.markStoriesRead(feedSet, olderThan, newerThan);
+                    dbHelper.updateLocalFeedCounts(feedSet);
                 }
                 impact |= NbActivity.UPDATE_METADATA;
                 break;

From ce09ce1a4a6091ea2edb5b116febbad63dc1a424 Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 3 Nov 2016 09:37:02 -0700
Subject: [PATCH 19/21] update UI counts via heuristic slightly more quickly
 before following up from server on mismatches.

---
 .../NewsBlur/src/com/newsblur/service/NBSyncService.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
index 006d6cb9a..3d327948d 100644
--- a/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
+++ b/clients/android/NewsBlur/src/com/newsblur/service/NBSyncService.java
@@ -243,14 +243,14 @@ public class NBSyncService extends Service {
 
             syncMetadata(startId);
 
-            checkRecounts();
-
             unreadsService.start(startId);
 
             imagePrefetchService.start(startId);
 
             finishActions();
 
+            checkRecounts();
+
             if (AppConstants.VERBOSE_LOG) Log.d(this.getClass().getName(), "finishing primary sync");
 
         } catch (Exception e) {

From e7a66e08dc0e00fbfd987c2c2831021d9ef4214c Mon Sep 17 00:00:00 2001
From: dosiecki <ojiikun@gmail.com>
Date: Thu, 3 Nov 2016 10:19:37 -0700
Subject: [PATCH 20/21] faster, more expensive UI response to mark-alls.

---
 clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java b/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
index e0380ed8e..a7051f11b 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
+++ b/clients/android/NewsBlur/src/com/newsblur/util/FeedUtils.java
@@ -168,6 +168,8 @@ public class FeedUtils {
                     ra = ReadingAction.markFeedRead(newFeedSet, olderThan, newerThan);
                 }
                 dbHelper.enqueueAction(ra);
+                ra.doLocal(dbHelper);
+                NbActivity.updateAllActivities(NbActivity.UPDATE_METADATA | NbActivity.UPDATE_STORY);
                 triggerSync(context);
                 return null;
             }

From b7dbfa11b53cebbe159d83a0198d435a5d87b9e1 Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 3 Nov 2016 13:23:14 -0700
Subject: [PATCH 21/21] Upgrading mongo.

---
 config/mongodb.prod.conf |  4 ++--
 fabfile.py               | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config/mongodb.prod.conf b/config/mongodb.prod.conf
index 19d7a2776..4017369ba 100644
--- a/config/mongodb.prod.conf
+++ b/config/mongodb.prod.conf
@@ -8,7 +8,7 @@
 dbpath=/var/lib/mongodb
 
 #where to log
-logpath=/var/log/mongodb/mongodb.log
+logpath=/var/log/mongod/mongod.log
 
 logappend=true
 
@@ -18,7 +18,7 @@ slowms=100
 
 syncdelay=5
 
-rest = true
+#rest = true
 #profile = 2
 # Enables periodic logging of CPU utilization and I/O wait
 #cpu = true
diff --git a/fabfile.py b/fabfile.py
index f0641586a..d521d322a 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -978,17 +978,21 @@ def copy_postgres_to_standby(master='db01'):
     put('config/postgresql_recovery.conf', '/var/lib/postgresql/9.4/main/recovery.conf', use_sudo=True)
     
 def setup_mongo():
+    MONGODB_VERSION = "2.6.12"
+    
     sudo('apt-key adv --keyserver keyserver.ubuntu.com --recv 7F0CEB10')
-    # sudo('echo "deb http://downloads.mongodb.org/distros/ubuntu 10.10 10gen" >> /etc/apt/sources.list.d/10gen.list')
-    sudo('echo "\ndeb http://downloads-distro.mongodb.org/repo/debian-sysvinit dist 10gen" | sudo tee -a /etc/apt/sources.list')
+    sudo('echo "deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen" | sudo tee /etc/apt/sources.list.d/mongodb.list')
+    # sudo('echo "\ndeb http://downloads-distro.mongodb.org/repo/debian-sysvinit dist 10gen" | sudo tee -a /etc/apt/sources.list')
     sudo('apt-get update')
-    sudo('apt-get -y install mongodb-10gen')
+    sudo('apt-get install -y mongodb-org=%s mongodb-org-server=%s mongodb-org-shell=%s mongodb-org-mongos=%s mongodb-org-tools=%s' %
+         (MONGODB_VERSION, MONGODB_VERSION, MONGODB_VERSION, MONGODB_VERSION, MONGODB_VERSION))
     put('config/mongodb.%s.conf' % ('prod' if env.user != 'ubuntu' else 'ec2'),
         '/etc/mongodb.conf', use_sudo=True)
     run('echo "ulimit -n 100000" > mongodb.defaults')
     sudo('mv mongodb.defaults /etc/default/mongodb')
-    sudo('/etc/init.d/mongodb restart')
-    put('config/logrotate.mongo.conf', '/etc/logrotate.d/mongodb', use_sudo=True)
+    sudo('cp mongodb.defaults /etc/default/mongod')
+    sudo('/etc/init.d/mongod restart')
+    put('config/logrotate.mongo.conf', '/etc/logrotate.d/mongod', use_sudo=True)
 
     # Reclaim 5% disk space used for root logs. Set to 1%.
     with settings(warn_only=True):