Merge pull request #869 from ZeusWPI/chore/more-updates

Fix bug in Urgent.fm
ZeusWPI · Dec 12, 2023 · d55de85 · d55de85
2 parents 98a9d39 + 36e063d
commit d55de85
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/app/src/main/java/be/ugent/zeus/hydra/urgent/MediaNotificationBuilder.java b/app/src/main/java/be/ugent/zeus/hydra/urgent/MediaNotificationBuilder.java
@@ -52,6 +52,10 @@ class MediaNotificationBuilder {
 
     Notification buildNotification(MediaSessionCompat mediaSession) {
         MediaControllerCompat controller = mediaSession.getController();
+        var playbackState = controller.getPlaybackState();
+        if (playbackState == null) {
+            return null; // Nothing we can do currently.
+        }
 
         // Construct the actual notification
         NotificationCompat.Builder builder = new NotificationCompat.Builder(context, ChannelCreator.URGENT_CHANNEL);
@@ -65,10 +69,10 @@ Notification buildNotification(MediaSessionCompat mediaSession) {
                         .setShowActionsInCompactView(0);
 
         // Construct the play/pause button.
-        boolean isPlaying = controller.getPlaybackState().getState() == PlaybackStateCompat.STATE_PLAYING;
-        boolean isConnecting = controller.getPlaybackState().getState() == PlaybackStateCompat.STATE_CONNECTING
-                || controller.getPlaybackState().getState() == PlaybackStateCompat.STATE_BUFFERING;
-        boolean isError = controller.getPlaybackState().getState() == PlaybackStateCompat.STATE_ERROR;
+        boolean isPlaying = playbackState.getState() == PlaybackStateCompat.STATE_PLAYING;
+        boolean isConnecting = playbackState.getState() == PlaybackStateCompat.STATE_CONNECTING
+                || playbackState.getState() == PlaybackStateCompat.STATE_BUFFERING;
+        boolean isError = playbackState.getState() == PlaybackStateCompat.STATE_ERROR;
         if (isPlaying || isConnecting) {
             builder.addAction(new NotificationCompat.Action(
                     R.drawable.noti_ic_stop,

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -25,10 +25,13 @@
             toolsVersion = null;
             platformToolsVersion = androidVersions.platformToolsVersion;
             buildToolsVersions = [ androidVersions.buildToolsVersions ];
-            includeEmulator = false;
+            includeEmulator = true;
+            emulatorVersion = "34.1.9";
+            includeSystemImages = true;
+            systemImageTypes = [ "google_apis_playstore" ];
+            abiVersions = [ "x86_64" ];
             platformVersions = [ androidVersions.platformVersions ];
-            # Enable once nixpkgs is fixed...
-            includeSources = false;
+            includeSources = true;
             includeNDK = false;
             useGoogleAPIs = true;
             includeExtras = [

diff --git a/gradle.properties b/gradle.properties
@@ -20,7 +20,6 @@
 # SOFTWARE.
 #
 
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 android.useAndroidX=true