Merge pull request #3 from igoratron/master

StreamProxy fix for KitKat
lastfm · Apr 24, 2014 · 9ce6703 · 9ce6703 · jensz12 · Sep 14, 2014
2 parents 9e20e19 + a5ae49d
commit 9ce6703
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="fm.last.android" android:versionCode="62" android:versionName="1.9.9.1">
+	package="fm.last.android" android:versionCode="63" android:versionName="1.9.9.2">
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.WAKE_LOCK" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

diff --git a/app/src/fm/last/android/player/StreamProxy.java b/app/src/fm/last/android/player/StreamProxy.java
@@ -157,7 +157,7 @@ private HttpRequest readRequest(Socket client) {
     	  if(line != null && line.toLowerCase().startsWith("user-agent: ")) {
     		  ua = line.substring(12);
     	  }
-      } while(line != null && reader.ready());
+      } while(line != null && !"".equals(line) && reader.ready());
     } catch (IOException e) {
       Log.e(LOG_TAG, "Error parsing request", e);
       return request;
@@ -373,4 +373,4 @@ protected ClientConnectionOperator createConnectionOperator(
     }
   }
 
-}
+}