From 668feb135509421a174dad6614ff94f744f6e35a Mon Sep 17 00:00:00 2001
From: primaeval <primaeval@users.noreply.github.com>
Date: Mon, 20 Feb 2017 20:05:49 +0100
Subject: [PATCH] remove [] formatting (#353)

---
 .../org/xbmc/kore/jsonrpc/method/Files.java    |  6 ++++++
 .../org/xbmc/kore/jsonrpc/type/AddonType.java  |  8 ++++----
 .../ui/sections/addon/AddonListFragment.java   | 18 ++++++++++++++++--
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/xbmc/kore/jsonrpc/method/Files.java b/app/src/main/java/org/xbmc/kore/jsonrpc/method/Files.java
index a60df1d..f5e26d0 100644
--- a/app/src/main/java/org/xbmc/kore/jsonrpc/method/Files.java
+++ b/app/src/main/java/org/xbmc/kore/jsonrpc/method/Files.java
@@ -157,6 +157,12 @@ public class Files {
             ArrayNode items = (ArrayNode) fileNode;
             ArrayList<ListType.ItemFile> result = new ArrayList<ListType.ItemFile>(items.size());
             for (JsonNode item : items) {
+                String regex = "\\[.*?\\]";
+                JsonNode label = item.get("label");
+                if (!label.isNull()) {
+                    String new_label = label.textValue().replaceAll(regex, "");
+                    ((ObjectNode) item).put("label", new_label);
+                }
                 result.add(new ListType.ItemFile(item));
             }
             return result;
diff --git a/app/src/main/java/org/xbmc/kore/jsonrpc/type/AddonType.java b/app/src/main/java/org/xbmc/kore/jsonrpc/type/AddonType.java
index ceaf74b..957590f 100644
--- a/app/src/main/java/org/xbmc/kore/jsonrpc/type/AddonType.java
+++ b/app/src/main/java/org/xbmc/kore/jsonrpc/type/AddonType.java
@@ -103,16 +103,16 @@ public class AddonType {
         public static final String VERSION = "version";
 
         public final String addonid;
-        public final String author;
+        public String author;
         public final boolean broken;
-        public final String description;
+        public String description;
         public final String disclaimer;
         public final Boolean enabled;
         public final String fanart;
-        public final String name;
+        public String name;
         public final String path;
         public final int rating;
-        public final String summary;
+        public String summary;
         public final String thumbnail;
         public final String type;
         public final String version;
diff --git a/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
index b92025b..dc87b06 100644
--- a/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/sections/addon/AddonListFragment.java
@@ -42,6 +42,8 @@ import org.xbmc.kore.utils.LogUtils;
 import org.xbmc.kore.utils.UIUtils;
 import org.xbmc.kore.utils.Utils;
 
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import butterknife.ButterKnife;
@@ -167,7 +169,12 @@ public class AddonListFragment extends Fragment
                  .show();
         }
     }
-
+    public class AddonNameComparator implements Comparator<AddonType.Details>
+    {
+        public int compare(AddonType.Details left, AddonType.Details right) {
+            return left.name.toLowerCase().compareTo(right.name.toLowerCase());
+        }
+    }
     /**
      * Get the addons list and setup the gridview
      */
@@ -186,7 +193,14 @@ public class AddonListFragment extends Fragment
             @Override
             public void onSuccess(List<AddonType.Details> result) {
                 if (!isAdded()) return;
-
+                for (AddonType.Details addon : result) {
+                    String regex = "\\[.*?\\]";
+                    addon.name = addon.name.replaceAll(regex, "");
+                    addon.description = addon.description.replaceAll(regex, "");
+                    addon.summary = addon.summary.replaceAll(regex, "");
+                    addon.author = addon.author.replaceAll(regex, "");
+                }
+                Collections.sort(result, new AddonNameComparator());
                 adapter.clear();
                 for (AddonType.Details addon : result) {
                     if (addon.type.equals(AddonType.Types.UNKNOWN) ||