Fix for uploads courses

app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadActivity.java

@@ -421,7 +421,7 @@ public class UploadActivity extends BaseActivity {
             generateFieldsButton.setEnabled(true);
         }
         FirebaseRemoteConfig firebaseRemoteConfig = FirebaseRemoteConfig.getInstance();
-        String uploadsCoursesString = firebaseRemoteConfig.getString(firebaseConfigUploadsCoursesKey);
+        String uploadsCoursesString = firebaseRemoteConfig.getValue(firebaseConfigUploadsCoursesKey).asString();
         JSONObject uploadsCoursesJSON;
         try {
             uploadsCoursesJSON = new JSONObject(uploadsCoursesString);

app/src/main/java/gr/thmmy/mthmmy/activities/upload/UploadsCourse.java

@@ -6,6 +6,8 @@ import org.json.JSONObject;
 
 import java.util.HashMap;
 
+import timber.log.Timber;
+
 public class UploadsCourse {
     private final int id;
     private final String name, minifiedName, greeklishName;
@@ -43,7 +45,9 @@ public class UploadsCourse {
                 String name = course.getString("name");
                 String minifiedName = course.getString("minified");
                 String greeklisName = course.getString("greeklish");
-                coursesHashMap.put(course.getInt("id"), new UploadsCourse(id, name, minifiedName, greeklisName));
+                if(coursesHashMap.containsKey(id))
+                    Timber.w("Added a duplicate id (%d) in uploads courses!", id);
+                coursesHashMap.put(id, new UploadsCourse(id, name, minifiedName, greeklisName));
             }
         }
 

app/src/main/res/raw/uploads_courses.json

@@ -435,6 +435,10 @@
         {
           "id": "20",
           "name": "8ο εξάμηνο",
+          "categories": [
+            {
+              "id": "5526",
+              "name": "8ο εξάμηνο [ΠΠΣ]",
               "categories": [
                 {
                   "id": "990",
@@ -496,6 +500,8 @@
                     }
                   ]
                 }
+              ]
+            }
           ],
           "courses": [
             {
@@ -758,10 +764,6 @@
           "id": "15",
           "name": "7ο εξάμηνο",
           "categories": [
-            {
-              "id": "4943",
-              "name": "7ο εξάμηνο [ΠΠΣ]",
-              "categories": [
             {
               "id": "4943",
               "name": "7ο εξάμηνο [ΠΠΣ]",
@@ -798,8 +800,6 @@
                 }
               ]
             }
-              ]
-            }
           ],
           "courses": [
             {
@@ -1462,12 +1462,6 @@
                       "minified": "Γεωηλεκτρομαγνητισμός",
                       "greeklish": "Geoilektromagnitismos"
                     },
-                    {
-                      "id": "150",
-                      "name": "Μικροκυματική Τηλεπισκόπηση [ΠΠΣ]",
-                      "minified": "Μικροκυματική Τηλεπισκόπηση",
-                      "greeklish": "MRS"
-                    },
                     {
                       "id": "157",
                       "name": "Τεχνικές Κωδικοποίησης [ΠΠΣ]",
@@ -1480,6 +1474,12 @@
                   "id": "6000",
                   "name": "Υποχρεωτικά Μαθήματα [ΠΠΣ]",
                   "courses": [
+                    {
+                      "id": "150",
+                      "name": "Μικροκυματική Τηλεπισκόπηση [ΠΠΣ]",
+                      "minified": "Μικροκυματική Τηλεπισκόπηση",
+                      "greeklish": "MRS"
+                    },
                     {
                       "id": "149",
                       "name": "Σύνθεση Τηλεπικοινωνιακών Διατάξεων [ΠΠΣ]",
@@ -1487,6 +1487,8 @@
                       "greeklish": "Synthesi_Tilepikoinoniakon_Diatakseon"
                     }
                   ]
+                }
+              ]
             },
             {
               "id": "2024",
@@ -1563,8 +1565,6 @@
           ]
         }
       ]
-        }
-      ]
     },
     {
       "id": "3",