Load device type from conf

Author: devgianlu

api/src/main/java/xyz/gianlu/librespot/api/Main.java

@@ -16,7 +16,7 @@
 public class Main {
 
     public static void main(String[] args) throws IOException, GeneralSecurityException, MercuryClient.PubSubException, SpotifyIrc.IrcException, Session.SpotifyAuthenticationException {
-        Session session = new Session.Builder(Session.DeviceType.Computer, new FileConfiguration(new File("conf.properties")))
+        Session session = new Session.Builder(new FileConfiguration(new File("conf.properties")))
                 .userPass(args[0], args[1])
                 .create();
 

conf.properties

@@ -1,2 +1,3 @@
 # Configuration!
-deviceName=librespot-java
+deviceName=librespot-java
+deviceType=Computer

core/src/main/java/xyz/gianlu/librespot/AbsConfiguration.java

@@ -1,6 +1,7 @@
 package xyz.gianlu.librespot;
 
 import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.player.CacheManager;
 import xyz.gianlu.librespot.player.Player;
 
@@ -11,4 +12,7 @@ public abstract class AbsConfiguration implements Player.PlayerConfiguration, Ca
 
     @Nullable
     public abstract String deviceName();
+
+    @Nullable
+    public abstract Session.DeviceType deviceType();
 }

core/src/main/java/xyz/gianlu/librespot/DefaultConfiguration.java

@@ -1,6 +1,7 @@
 package xyz.gianlu.librespot;
 
 import org.jetbrains.annotations.NotNull;
+import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.player.TrackHandler;
 
 import java.io.File;
@@ -54,4 +55,10 @@ public boolean doCleanUp() {
     public String deviceName() {
         return "librespot-java";
     }
+
+    @NotNull
+    @Override
+    public Session.DeviceType deviceType() {
+        return Session.DeviceType.Computer;
+    }
 }

core/src/main/java/xyz/gianlu/librespot/FileConfiguration.java

@@ -2,6 +2,7 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import xyz.gianlu.librespot.core.Session;
 import xyz.gianlu.librespot.player.TrackHandler;
 
 import java.io.File;
@@ -72,4 +73,11 @@ public float normalisationPregain() {
     public @Nullable String deviceName() {
         return properties.getProperty("deviceName", null);
     }
+
+    @Override
+    public @Nullable Session.DeviceType deviceType() {
+        String val = properties.getProperty("deviceType", null);
+        if (val == null) return null;
+        return Session.DeviceType.valueOf(val);
+    }
 }

core/src/main/java/xyz/gianlu/librespot/Main.java

@@ -14,7 +14,7 @@
 public class Main {
 
     public static void main(String[] args) throws IOException, GeneralSecurityException, Session.SpotifyAuthenticationException, SpotifyIrc.IrcException, MercuryClient.PubSubException {
-        Session session = new Session.Builder(Session.DeviceType.Computer, new FileConfiguration(new File("conf.properties")))
+        Session session = new Session.Builder(new FileConfiguration(new File("conf.properties")))
                 // .facebook()
                 // .zeroconf()
                 .userPass(args[0], args[1])

core/src/main/java/xyz/gianlu/librespot/core/Session.java

@@ -404,11 +404,15 @@ public Builder(@NotNull DeviceType deviceType, @NotNull String deviceName, @NotN
             this.inner = new Inner(deviceType, deviceName, configuration);
         }
 
-        public Builder(@NotNull DeviceType deviceType, @NotNull AbsConfiguration configuration) {
+        public Builder(@NotNull AbsConfiguration configuration) {
             String deviceName = configuration.deviceName();
             if (deviceName == null || deviceName.isEmpty())
                 throw new IllegalArgumentException("Device name required: " + deviceName);
 
+            DeviceType deviceType = configuration.deviceType();
+            if (deviceType == null)
+                throw new IllegalArgumentException("Device type required!");
+
             this.inner = new Inner(deviceType, deviceName, configuration);
         }
 

core/src/main/java/xyz/gianlu/librespot/crypto/Shannon.java

@@ -5,7 +5,7 @@
  * <p>
  * Based on original reference implementation in C.
  *
- * @author Felix Bruns <[email protected]>
+ * @author Felix Bruns ([email protected])
  */
 @SuppressWarnings("ALL")
 public class Shannon {