From 269b5ec4e208788d0cdb479f1a1f34dd3715119f Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 4 Jul 2016 16:15:51 +1200 Subject: [PATCH 1/2] Found source of problem --- app/src/main/java/fr/free/nrw/commons/Media.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java index ba0053442..1bce50c0e 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.java +++ b/app/src/main/java/fr/free/nrw/commons/Media.java @@ -235,6 +235,7 @@ public class Media implements Parcelable { width = in.readInt(); height = in.readInt(); license = in.readString(); + //FIXME: Null check in.readStringList(categories); descriptions = in.readHashMap(ClassLoader.getSystemClassLoader()); } From 05c1a837904b87acdf22c3b183aa9fced3f69f15 Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 4 Jul 2016 17:15:47 +1200 Subject: [PATCH 2/2] Add null check for categories in Media.java --- app/src/main/java/fr/free/nrw/commons/Media.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/Media.java b/app/src/main/java/fr/free/nrw/commons/Media.java index 1bce50c0e..e7c3b058a 100644 --- a/app/src/main/java/fr/free/nrw/commons/Media.java +++ b/app/src/main/java/fr/free/nrw/commons/Media.java @@ -235,8 +235,9 @@ public class Media implements Parcelable { width = in.readInt(); height = in.readInt(); license = in.readString(); - //FIXME: Null check - in.readStringList(categories); + if (categories != null) { + in.readStringList(categories); + } descriptions = in.readHashMap(ClassLoader.getSystemClassLoader()); }