From 2edcabc0c9433a24dc716d3fc23dd10af7205d60 Mon Sep 17 00:00:00 2001 From: ojiikun Date: Wed, 17 Apr 2013 00:38:13 +0000 Subject: [PATCH] Formalize top-level folder name workaround. --- .../src/com/newsblur/network/domain/FeedFolderResponse.java | 5 ++++- .../android/NewsBlur/src/com/newsblur/util/AppConstants.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/media/android/NewsBlur/src/com/newsblur/network/domain/FeedFolderResponse.java b/media/android/NewsBlur/src/com/newsblur/network/domain/FeedFolderResponse.java index a287970b9..fa4f2f600 100644 --- a/media/android/NewsBlur/src/com/newsblur/network/domain/FeedFolderResponse.java +++ b/media/android/NewsBlur/src/com/newsblur/network/domain/FeedFolderResponse.java @@ -17,6 +17,7 @@ import com.google.gson.JsonParser; import com.google.gson.annotations.SerializedName; import com.newsblur.domain.Feed; import com.newsblur.domain.SocialFeed; +import com.newsblur.util.AppConstants; public class FeedFolderResponse { @@ -131,7 +132,9 @@ public class FeedFolderResponse { if(key != null) { builder.append(key); } else { - //builder.append(" (no folder)"); + // a null key means we are at the root. give these a pseudo-folder name, since the DB and many + // classes would be very unhappy with a null foldername. + builder.append(AppConstants.ROOT_FOLDER); } return builder.toString(); } diff --git a/media/android/NewsBlur/src/com/newsblur/util/AppConstants.java b/media/android/NewsBlur/src/com/newsblur/util/AppConstants.java index 60b60678a..70d6afced 100644 --- a/media/android/NewsBlur/src/com/newsblur/util/AppConstants.java +++ b/media/android/NewsBlur/src/com/newsblur/util/AppConstants.java @@ -14,4 +14,5 @@ public class AppConstants { public static final float FONT_SIZE_LOWER_BOUND = 1.0f; public static final float FONT_SIZE_INCREMENT_FACTOR = 5; + public static final String ROOT_FOLDER = " _TOP_LEVEL_"; }