bug fixes and improvements

Author: Ashfaq Ahmad

app/src/main/java/com/example/android/sampletvinput/parsers/MjunoonTvParser.java

@@ -51,15 +51,14 @@ private static String extractStreamUrl(String data) throws IOException
         for (String streamUrl : streamUrls) {
             String html_response = SimpleHttpClient.GET(streamUrl, Util.USER_AGENT_FIREFOX);
 
-            if(html_response.contains("#EXTM3U")) {
-                return streamUrl;
+            if(html_response != null && html_response.contains("#EXTM3U")) {
+                return parseStreamUrl(streamUrl);
             }
         }
 
         return null;
     }
 
-    /*
     private static String parseStreamUrl(String streamUrl) throws IOException {
         String html_response = SimpleHttpClient.GET(streamUrl, Util.USER_AGENT_FIREFOX);
 
@@ -91,6 +90,4 @@ private static String parseStreamUrl(String streamUrl) throws IOException {
 
         return null;
     }
-    */
-
 }

app/src/main/java/com/example/android/sampletvinput/parsers/TvUrlParser.java

@@ -19,16 +19,19 @@ public static String parseVideoUrl(String videoUrl) {
 
         for(String url : videoUrlArray) {
             returnUrl = null;
+            boolean parserFound = false;
             for (VideoUrlParser videoUrlParser: videoUrlParserArray) {
                 if(url.contains(videoUrlParser.getParserId())) {
+                    parserFound = true;
                     returnUrl = videoUrlParser.parseVideoUrl(url);
                     break;
                 }
             }
 
-            if(returnUrl == null){
-                returnUrl = url;
+            if(parserFound == false) {
+                returnUrl = videoUrl;
             }
+
             if(SimpleHttpClient.isValidUrl(returnUrl, Util.USER_AGENT_FIREFOX)) {
                 return returnUrl;
             }

app/src/main/java/com/example/android/sampletvinput/rich/RichTvInputService.java

@@ -233,9 +233,7 @@ public boolean onPlayProgram(Program program, long startPosMs) {
             if (startPosMs > 0) {
                 mPlayer.seekTo(startPosMs);
             }
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                notifyTimeShiftStatusChanged(TvInputManager.TIME_SHIFT_STATUS_AVAILABLE);
-            }
+            notifyTimeShiftStatusChanged(TvInputManager.TIME_SHIFT_STATUS_AVAILABLE);
             mPlayer.setPlayWhenReady(true);
             return true;
         }
@@ -248,9 +246,7 @@ public boolean onPlayRecordedProgram(RecordedProgram recordedProgram) {
             long recordingStartTime = recordedProgram.getInternalProviderData()
                     .getRecordedProgramStartTime();
             mPlayer.seekTo(recordingStartTime - recordedProgram.getStartTimeUtcMillis());
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-                notifyTimeShiftStatusChanged(TvInputManager.TIME_SHIFT_STATUS_AVAILABLE);
-            }
+            notifyTimeShiftStatusChanged(TvInputManager.TIME_SHIFT_STATUS_AVAILABLE);
             mPlayer.setPlayWhenReady(true);
             return true;
         }

app/src/main/java/com/example/android/sampletvinput/util/SimpleHttpClient.java

@@ -19,7 +19,7 @@ public class SimpleHttpClient
     private static String TAG = "SimpleHttpClient";
 
     public static final String ENCODING_UTF_8 = "UTF-8";
-    public static final int DEFAULT_TIMEOUT = 10000;
+    public static final int DEFAULT_TIMEOUT = 3000;
 
     public static final String HTTP_GET = "GET";
     public static final String HTTP_POST = "POST";
@@ -48,6 +48,10 @@ public static boolean isValidUrl(String urlStr, String userAgent) {
         URL url = null;
         HttpURLConnection urlConnection = null;
 
+        if(urlStr == null) {
+            return false;
+        }
+
         try {
             url = new URL(urlStr);
             urlConnection = (HttpURLConnection) url.openConnection();
@@ -83,6 +87,10 @@ private static String execute(String urlStr,
         OutputStream outStream = null;
         String response = null;
 
+        if(urlStr == null) {
+            return null;
+        }
+
         try
         {
             url = new URL(urlStr);
@@ -117,9 +125,10 @@ private static String execute(String urlStr,
                 response="";
             }
         } catch (Exception e) {
-
-            inStream = new BufferedInputStream(urlConnection.getInputStream());
-            response = getInput(inStream);
+            if(urlConnection != null) {
+                inStream = new BufferedInputStream(urlConnection.getInputStream());
+                response = getInput(inStream);
+            }
         }
         finally
         {