improved exceptionhandling

Author: CodeManDev

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'dev.codeman'
-version = '0.0.5'
+version = '0.0.6'
 
 repositories {
     mavenCentral()
@@ -20,12 +20,13 @@ java {
 }
 
 def nativeDownloadDir = layout.buildDirectory.dir("native-download").get().asFile
-def nativeDllFile = nativeDownloadDir.toPath().resolve("SMTC4J.dll").toFile()
+def downloadedNativeDllFile = nativeDownloadDir.toPath().resolve("SMTC4J.dll").toFile()
 def resourcesNativeDir = layout.buildDirectory.dir("resources/main/native").get().asFile
+def nativeDllFile = file("src/main/resources/native/SMTC4J.dll") // for dev environment
 
 tasks.register("downloadNative") {
     doLast {
-        if (nativeDllFile.exists()) {
+        if (downloadedNativeDllFile.exists() || nativeDllFile.exists()) {
             println "Native DLL already exists, skipping download."
             return
         }
@@ -36,7 +37,7 @@ tasks.register("downloadNative") {
         println "Downloading native DLL from $url"
 
         new URL(url).withInputStream { input ->
-            nativeDllFile.withOutputStream { output ->
+            downloadedNativeDllFile.withOutputStream { output ->
                 output << input
             }
         }
@@ -45,8 +46,9 @@ tasks.register("downloadNative") {
 
 tasks.register("copyNativeIntoResources", Copy) {
     dependsOn "downloadNative"
-    from(nativeDllFile)
+    from(downloadedNativeDllFile)
     into(resourcesNativeDir)
+    onlyIf { downloadedNativeDllFile.exists() }
 }
 
 tasks.named("processResources") {

src/main/java/dev/codeman/smtc4j/SMTC4J.java

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSyntaxException;
 
 import java.io.*;
 import java.util.concurrent.Executors;
@@ -107,11 +108,12 @@ public static MediaInfo parsedMediaInfo() {
             return new MediaInfo("", "", "", 0, "", "");
         }
 
-        MediaInfo parsed = GSON.fromJson(info, MediaInfo.class);
-        if (parsed == null)
+        try  {
+            return GSON.fromJson(info, MediaInfo.class);
+        }  catch (JsonSyntaxException e) {
+            System.out.println("Error parsing media info: " + e.getMessage());
             return new MediaInfo("", "", "", 0, "", "");
-
-        return parsed;
+        }
     }
 
     public static PlaybackState parsedPlaybackState() {
@@ -124,11 +126,12 @@ public static PlaybackState parsedPlaybackState() {
             return new PlaybackState(-1, 0);
         }
 
-        PlaybackState parsed = GSON.fromJson(state, PlaybackState.class);
-        if (parsed == null)
+        try {
+            return GSON.fromJson(state, PlaybackState.class);
+        } catch (Exception e) {
+            System.out.println("Error retrieving playback state: " + e.getMessage());
             return new PlaybackState(-1, 0);
-
-        return parsed;
+        }
     }
 
     public static void pressKey(MediaKey key) {