* removing empty genres etc.

iamSahdeep · Feb 16, 2019 · a13c9f7 · a13c9f7
1 parent 57dd77c
commit a13c9f7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,5 @@ before_script:
  - chmod +x gradlew
 before_install:
  - yes | sdkmanager "platforms;android-28"
-after_success: 
-- ./upload-apk.sh 
 script:
 - ./gradlew build --stacktrace
diff --git a/app/src/main/java/com/sahdeepsingh/Bop/SongData/Data.java b/app/src/main/java/com/sahdeepsingh/Bop/SongData/Data.java
@@ -470,8 +470,12 @@ public ArrayList<String> getGenres() {
 
         ArrayList<String> genres = new ArrayList<String>();
 
-        for (String genre : genreIdToGenreNameMap.values())
-            genres.add(genre);
+        for (Song song : songs) {
+            String genre = song.getGenre();
+
+            if ((genre != null) && (!genres.contains(genre)))
+                genres.add(genre);
+        }
 
         Collections.sort(genres);
 

diff --git a/buildApk/app-debug.apk b/buildApk/app-debug.apk
diff --git a/upload-apk.sh b/upload-apk.sh