public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #681 from dosiecki/master

Browse source 
Android: Fix crash in #679.
This commit is contained in:
Samuel Clay 2015-04-07 10:14:30 -07:00
commit 3fab01e75f
3 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/android/NewsBlur/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.newsblur"
android:versionCode="89"
android:versionName="4.2.3b1" >
android:versionName="4.2.3b4" >
<uses-sdk
android:minSdkVersion="11"

18
clients/android/NewsBlur/src/com/newsblur/domain/Folder.java
View file

@ -11,6 +11,8 @@ import com.newsblur.database.DatabaseConstants;
import com.newsblur.util.AppConstants;
public class Folder {
public static final String SPLIT_DELIM = ",";
/** Actual unique name of the folder. */
public String name;
@ -21,6 +23,10 @@ public class Folder {
/** Set of any feeds contained in this folder. */
public List<String> feedIds;
// TODO: the use of non-normalised fields with the delimeter scheme can cause minor
// bugs for folders with certain names. When we switch to an object store, that scheme
// should be removed asap.
public static Folder fromCursor(Cursor c) {
if (c.isBeforeFirst()) {
c.moveToFirst();
@ -29,22 +35,22 @@ public class Folder {
folder.name = c.getString(c.getColumnIndex(DatabaseConstants.FOLDER_NAME));
String parents = c.getString(c.getColumnIndex(DatabaseConstants.FOLDER_PARENT_NAMES));
folder.parents = new ArrayList<String>();
for (String name : TextUtils.split(parents, ",")) { folder.parents.add(name);}
for (String name : TextUtils.split(parents, SPLIT_DELIM)) { folder.parents.add(name);}
String children = c.getString(c.getColumnIndex(DatabaseConstants.FOLDER_CHILDREN_NAMES));
folder.children = new ArrayList<String>();
for (String name : TextUtils.split(children, ",")) { folder.children.add(name);}
for (String name : TextUtils.split(children, SPLIT_DELIM)) { folder.children.add(name);}
String feeds = c.getString(c.getColumnIndex(DatabaseConstants.FOLDER_FEED_IDS));
folder.feedIds = new ArrayList<String>();
for (String id : TextUtils.split(feeds, ",")) { folder.feedIds.add(id);}
for (String id : TextUtils.split(feeds, SPLIT_DELIM)) { folder.feedIds.add(id);}
return folder;
}
public ContentValues getValues() {
ContentValues values = new ContentValues();
values.put(DatabaseConstants.FOLDER_NAME, name);
values.put(DatabaseConstants.FOLDER_PARENT_NAMES, TextUtils.join(",", parents));
values.put(DatabaseConstants.FOLDER_CHILDREN_NAMES, TextUtils.join(",", children));
values.put(DatabaseConstants.FOLDER_FEED_IDS, TextUtils.join(",", feedIds));
values.put(DatabaseConstants.FOLDER_PARENT_NAMES, TextUtils.join(SPLIT_DELIM, parents));
values.put(DatabaseConstants.FOLDER_CHILDREN_NAMES, TextUtils.join(SPLIT_DELIM, children));
values.put(DatabaseConstants.FOLDER_FEED_IDS, TextUtils.join(SPLIT_DELIM, feedIds));
return values;
}

7
clients/android/NewsBlur/src/com/newsblur/network/domain/FeedFolderResponse.java
View file

@ -116,10 +116,13 @@ public class FeedFolderResponse {
// recurse - nested folders are just objects with (usually one) field named for the folder
// that is a list of contained feeds or additional folders
for (Entry<String, JsonElement> next : entrySet) {
children.add(next.getKey());
String nextName = next.getKey();
// our DB uses a woraround that requires exclusive use of a delimiter char
nextName = nextName.replaceAll(Folder.SPLIT_DELIM, "").trim();
children.add(nextName);
List<String> appendedParentList = new ArrayList<String>(parentNames);
appendedParentList.add(name);
parseFolderArray(appendedParentList, next.getKey(), (JsonArray) next.getValue());
parseFolderArray(appendedParentList, nextName, (JsonArray) next.getValue());
}
}
}