Merge pull request #14 in THFM/fm.touhou.touhoufm from...

Merge pull request #14 in THFM/fm.touhou.touhoufm from bugfix/THFMA-7-song-information-doesn-t-show to development

* commit '61dcb3f0':
  Fixed song info

app/build.gradle

@@ -64,7 +64,7 @@ dependencies {
     testCompile 'org.powermock:powermock-api-mockito:1.6.5'
     compile 'com.android.support:appcompat-v7:26.1.0'
     compile 'com.android.support:design:26.1.0'
-    compile 'org.java-websocket:Java-WebSocket:1.3.0'
+    compile 'org.java-websocket:Java-WebSocket:1.3.7'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.android.support:support-v4:26.1.0'
     compile 'com.android.support:recyclerview-v7:26.1.0'

app/src/main/java/fm/touhou/touhoufm/service/RadioService.java

@@ -28,7 +28,6 @@ import android.widget.RatingBar;
 import android.widget.Toast;
 
 import org.java_websocket.client.WebSocketClient;
-import org.java_websocket.drafts.Draft_17;
 import org.java_websocket.handshake.ServerHandshake;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -368,7 +367,7 @@ public class RadioService extends Service implements AudioManager.OnAudioFocusCh
         private boolean mReconnect = true;
 
         TouhouSocket(URI uri) {
-            super(uri, new Draft_17());
+            super(uri);
         }
 
         @Override

app/src/main/res/values/strings.xml

@@ -14,7 +14,7 @@
     <string name="title_now_playing">Now Playing</string>
     <string name="title_playlist">Playlist</string>
     <string name="websocket_error">"Websocket error: "</string>
-    <string name="websocket_url" translatable="false">ws://www.touhou.fm/wsapp/</string>
+    <string name="websocket_url" translatable="false">wss://www.touhou.fm/wsapp/</string>
 
     <string name="play_pause">Play / Pause</string>
     <string name="battery_optimization_warning">You are running Marshmallow or higher which has Battery optimization. This will cause problems with streaming when your phone display is off and not charging. In order to fix this please disable optimization for the TouhouFM app in Battery settings.</string>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         maven { url "https://maven.google.com" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'org.ajoberstar:grgit:1.4.+'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'