Merge branch 'dev' into shuffle-albums

timusus · Oct 12, 2017 · 4793bda · 4793bda
2 parents a3326a4 + 59afac0
commit 4793bda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ android:
   components:
   - tools
   - platform-tools
-  - build-tools-26.0.0
+  - build-tools-26.0.2
   - android-26
   - extra-android-support
   - extra-android-m2repository

diff --git a/app/src/main/java/com/simplecity/amp_library/utils/DataManager.java b/app/src/main/java/com/simplecity/amp_library/utils/DataManager.java
@@ -278,7 +278,7 @@ private Observable<List<BlacklistedSong>> getBlacklistRelay() {
             blacklistSubscription = getBlacklistDatabase()
                     .createQuery(BlacklistDbOpenHelper.TABLE_SONGS, "SELECT * FROM " + BlacklistDbOpenHelper.TABLE_SONGS)
                     .mapToList(BlacklistedSong::new)
-                    .subscribe(blacklistRelay, error -> LogUtils.logException(TAG, "getBlacklistRelay threw rror", error));
+                    .subscribe(blacklistRelay, error -> LogUtils.logException(TAG, "getBlacklistRelay threw error", error));
         }
         return blacklistRelay.subscribeOn(Schedulers.io()).map(ArrayList::new);
     }