From 666b7a0843de404362c5ac7ebff916083d3e8162 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sun, 18 Mar 2018 19:16:31 +1000
Subject: [PATCH] Set if-else block for direct Cats in CategorizationFragment

---
 .../category/CategorizationFragment.java      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
index bdf000288..9c2946326 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
@@ -268,10 +268,21 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
     }
 
     private Observable<CategoryItem> defaultCategories() {
-        return directCategories()
-                .concatWith(gpsCategories())
-                .concatWith(titleCategories())
-                .concatWith(recentCategories());
+
+        Observable<CategoryItem> directCat = directCategories();
+        if (hasDirectCategories) {
+            Timber.d("Image has direct Cat");
+            return directCat
+                    .concatWith(gpsCategories())
+                    .concatWith(titleCategories())
+                    .concatWith(recentCategories());
+        }
+        else {
+            Timber.d("Image has no direct Cat");
+            return gpsCategories()
+                    .concatWith(titleCategories())
+                    .concatWith(recentCategories());
+        }
     }
 
     private Observable<CategoryItem> directCategories() {
@@ -282,6 +293,7 @@ public class CategorizationFragment extends CommonsDaggerSupportFragment {
         if (!directCategory.equals("")) {
             hasDirectCategories = true;
             categoryList.add(directCategory);
+            Timber.d("DirectCat does not equal emptyString. Direct Cat list has " + categoryList);
         }
         return Observable.fromIterable(categoryList).map(name -> new CategoryItem(name, false));
     }