From db0508b9ab8ba46f1ee7d5bec576ef9ff45e0b40 Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Mon, 2 Nov 2015 15:03:11 +0000
Subject: [PATCH 1/7] refactored StreamingService interface so it acts as a
 Factory (returning new instances of called classes, eg Extractor), rather
 than passing Class objects (which loses type safety) which are then
 instantiated. Also noticed there is a conflict between existing gradle setup
 and mine: misc.xml and app.iml have had their jvm version values switched
 from 1.8 to 1.7

---
 .idea/gradle.xml                                |  2 +-
 .idea/misc.xml                                  |  2 +-
 app/app.iml                                     |  8 ++++----
 .../java/org/schabi/newpipe/Downloader.java     | 11 ++++++++++-
 .../org/schabi/newpipe/StreamingService.java    | 12 ++++++------
 .../main/java/org/schabi/newpipe/VideoInfo.java | 17 ++++++++++-------
 .../newpipe/VideoInfoItemViewCreator.java       |  2 +-
 .../schabi/newpipe/VideoItemDetailActivity.java |  7 ++++---
 .../schabi/newpipe/VideoItemDetailFragment.java | 11 +++++------
 .../schabi/newpipe/VideoItemListActivity.java   |  6 ++----
 .../schabi/newpipe/VideoItemListFragment.java   | 15 ++++-----------
 .../newpipe/youtube/YoutubeExtractor.java       |  2 +-
 .../schabi/newpipe/youtube/YoutubeService.java  | 11 +++++++----
 13 files changed, 56 insertions(+), 50 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index bd4202cb3..0833b17cd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d1998103..1a3eaffb4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/app.iml b/app/app.iml
index 58221a4e6..eefc8deb7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -92,12 +92,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java
index 051dacaff..9b9afb32d 100644
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -1,9 +1,12 @@
 package org.schabi.newpipe;
 
+import android.widget.Toast;
+
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.UnknownHostException;
 
 /**
  * Created by Christian Schabesberger on 14.08.15.
@@ -45,7 +48,13 @@ public class Downloader {
                 response.append(inputLine);
             }
             in.close();
-        } catch (Exception e) {
+
+        }
+        catch(UnknownHostException uhe) {//thrown when there's no internet connection
+            uhe.printStackTrace();
+            //Toast.makeText(getActivity(), uhe.getMessage(), Toast.LENGTH_LONG).show();
+        }
+        catch (Exception e) {
             e.printStackTrace();
         }
         return response.toString();
diff --git a/app/src/main/java/org/schabi/newpipe/StreamingService.java b/app/src/main/java/org/schabi/newpipe/StreamingService.java
index 6c98f5fbc..e82a1db82 100644
--- a/app/src/main/java/org/schabi/newpipe/StreamingService.java
+++ b/app/src/main/java/org/schabi/newpipe/StreamingService.java
@@ -24,12 +24,12 @@ public interface StreamingService {
     class ServiceInfo {
         public String name = "";
     }
-    ServiceInfo getServiceInfo();
-    Class getExtractorClass();
-    Class getSearchEngineClass();
+    public ServiceInfo getServiceInfo();
+    public Extractor getExtractorInstance();
+    public SearchEngine getSearchEngineInstance();
 
-    // When a VIEW_ACTION is caught this function will test if the url delivered within the calling
-    // Intent was meant to be watched with this Service.
-    // Return false if this service shall not allow to be callean through ACTIONs.
+    /**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
+    Intent was meant to be watched with this Service.
+    Return false if this service shall not allow to be callean through ACTIONs.*/
     boolean acceptUrl(String videoUrl);
 }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfo.java b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
index 5181b6d8b..9f44d36df 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
@@ -59,7 +59,7 @@ public class VideoInfo {
 
     public static final int VIDEO_AVAILABLE = 0x00;
     public static final int VIDEO_UNAVAILABLE = 0x01;
-    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;
+    public static final int VIDEO_UNAVAILABLE_GEMA = 0x02;//German DRM organisation; sound pretty draconian
 
     public static String getNameById(int id) {
         switch(id) {
@@ -68,8 +68,7 @@ public class VideoInfo {
             case I_WEBM: return F_WEBM;
             case I_M4A: return F_M4A;
             case I_WEBMA: return F_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
+            default: formatNotKnown(id);
         }
         return "";
     }
@@ -81,8 +80,7 @@ public class VideoInfo {
             case I_WEBM: return C_WEBM;
             case I_M4A: return C_M4A;
             case I_WEBMA: return C_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
+            default: formatNotKnown(id);
         }
         return "";
     }
@@ -94,8 +92,7 @@ public class VideoInfo {
             case I_WEBM: return M_WEBM;
             case I_M4A: return M_M4A;
             case I_WEBMA: return M_WEBMA;
-            default: Log.e(TAG, "format not known: " +
-                    Integer.toString(id) + "call the programmer he messed it up.");
+            default: formatNotKnown(id);
         }
         return "";
     }
@@ -109,6 +106,12 @@ public class VideoInfo {
         public String resolution = "";
     }
 
+    protected static void formatNotKnown(int id)
+    {
+        Log.e(TAG, "format not known: \"" +
+            Integer.toString(id) + "\". Call the programmer, he messed it up!");
+    }
+
     public static class AudioStream {
         public AudioStream(String url, int format, int bandwidth, int samplingRate) {
             this.url = url; this.format = format;
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
index 64db7d15d..e6618ddbf 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -61,7 +61,7 @@ public class VideoInfoItemViewCreator {
         if(!info.upload_date.isEmpty()) {
             holder.itemUploadDateView.setText(info.upload_date);
         } else {
-            //tewak if nececeary: This is a hack preventing to have a white space in the layout :P
+            //tweak if necessary: This is a hack to prevent having white space in the layout :P
             holder.itemUploadDateView.setText(info.view_count);
         }
 
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
index 8f4416f76..3f7860594 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -29,6 +29,7 @@ import android.widget.Toast;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+/***/
 public class VideoItemDetailActivity extends AppCompatActivity {
 
     private static final String TAG = VideoItemDetailActivity.class.toString();
@@ -69,7 +70,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                         try {
                             currentStreamingService = i;
                             extractor = (Extractor) ServiceList.getService(i)
-                                    .getExtractorClass().newInstance();
+                                    .getExtractorInstance();
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -123,9 +124,9 @@ public class VideoItemDetailActivity extends AppCompatActivity {
             // activity, the Up button is shown. Use NavUtils to allow users
             // to navigate up one level in the application structure. For
             // more details, see the Navigation pattern on Android Design:
-            //
+
             // http://developer.android.com/design/patterns/navigation.html#up-vs-back
-            //
+
             Intent intent = new Intent(this, VideoItemListActivity.class);
             intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
             NavUtils.navigateUpTo(this, intent);
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 653aed1af..4bb30472c 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -79,16 +79,15 @@ public class VideoItemDetailFragment extends Fragment {
 
     private class ExtractorRunnable implements Runnable {
         private Handler h = new Handler();
-        private Class extractorClass;
+        private Extractor extractor;
         private String videoUrl;
-        public ExtractorRunnable(String videoUrl, Class extractorClass, VideoItemDetailFragment f) {
-            this.extractorClass = extractorClass;
+        public ExtractorRunnable(String videoUrl, Extractor extractor, VideoItemDetailFragment f) {
+            this.extractor = extractor;
             this.videoUrl = videoUrl;
         }
         @Override
         public void run() {
             try {
-                Extractor extractor = (Extractor) extractorClass.newInstance();
                 VideoInfo videoInfo = extractor.getVideoInfo(videoUrl);
                 h.post(new VideoResultReturnedRunnable(videoInfo));
                 if (videoInfo.videoAvailableStatus == VideoInfo.VIDEO_AVAILABLE) {
@@ -170,7 +169,7 @@ public class VideoItemDetailFragment extends Fragment {
             }
 
         } catch (java.lang.NullPointerException e) {
-            // No god programm design i know. :/
+            // Not good program design, I know. :/
             Log.w(TAG, "updateThumbnail(): Fragment closed before thread ended work");
         }
     }
@@ -312,7 +311,7 @@ public class VideoItemDetailFragment extends Fragment {
                 StreamingService streamingService = ServiceList.getService(
                         getArguments().getInt(STREAMING_SERVICE));
                 extractorThread = new Thread(new ExtractorRunnable(
-                        getArguments().getString(VIDEO_URL), streamingService.getExtractorClass(), this));
+                        getArguments().getString(VIDEO_URL), streamingService.getExtractorInstance(), this));
                 autoPlayEnabled = getArguments().getBoolean(AUTO_PLAY);
                 extractorThread.start();
             } catch (Exception e) {
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index 4caeec171..9cea4bee2 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -87,13 +87,11 @@ public class VideoItemListActivity extends AppCompatActivity
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_videoitem_list);
 
-        listFragment = (VideoItemListFragment)
-                getSupportFragmentManager().findFragmentById(R.id.videoitem_list);
-
         //-------- remove this line when multiservice support is implemented ----------
         currentStreamingServiceId = ServiceList.getIdOfService("Youtube");
         //-----------------------------------------------------------------------------
-        VideoItemListFragment listFragment = (VideoItemListFragment) getSupportFragmentManager()
+
+        listFragment = (VideoItemListFragment) getSupportFragmentManager()
                 .findFragmentById(R.id.videoitem_list);
         listFragment.setStreamingService(ServiceList.getService(currentStreamingServiceId));
 
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index 950c29f54..4b83dd0a3 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -65,14 +65,14 @@ public class VideoItemListFragment extends ListFragment {
     }
 
     private class SearchRunnable implements Runnable {
-        private Class engineClass = null;
+        private SearchEngine engine;
         private String query;
         private int page;
         Handler h = new Handler();
         private volatile boolean run = true;
         private int requestId;
-        public SearchRunnable(Class engineClass, String query, int page, int requestId) {
-            this.engineClass = engineClass;
+        public SearchRunnable(SearchEngine engine, String query, int page, int requestId) {
+            this.engine = engine;
             this.query = query;
             this.page = page;
             this.requestId = requestId;
@@ -82,13 +82,6 @@ public class VideoItemListFragment extends ListFragment {
         }
         @Override
         public void run() {
-            SearchEngine engine = null;
-            try {
-                engine = (SearchEngine) engineClass.newInstance();
-            } catch(Exception e) {
-                e.printStackTrace();
-                return;
-            }
             try {
                 SearchEngine.Result result = engine.search(query, page);
                 if(run) {
@@ -179,7 +172,7 @@ public class VideoItemListFragment extends ListFragment {
     private void startSearch(String query, int page) {
         currentRequestId++;
         terminateThreads();
-        searchRunnable = new SearchRunnable(streamingService.getSearchEngineClass(), query, page, currentRequestId);
+        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(), query, page, currentRequestId);
         searchThread = new Thread(searchRunnable);
         searchThread.start();
     }
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
index 92a161c5b..47e00b2a9 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -50,7 +50,7 @@ public class YoutubeExtractor implements Extractor {
     private static final String TAG = YoutubeExtractor.class.toString();
 
     // These lists only contain itag formats that are supported by the common Android Video player.
-    // How ever if you are heading for a list showing all itag formats lock at
+    // How ever if you are heading for a list showing all itag formats look at
     // https://github.com/rg3/youtube-dl/issues/1687
 
     public static int resolveFormat(int itag) {
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
index 3dca3811d..dd9fa4397 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
@@ -1,6 +1,9 @@
 package org.schabi.newpipe.youtube;
 
 import org.schabi.newpipe.StreamingService;
+import org.schabi.newpipe.Extractor;
+import org.schabi.newpipe.SearchEngine;
+
 
 /**
  * Created by Christian Schabesberger on 23.08.15.
@@ -30,12 +33,12 @@ public class YoutubeService implements StreamingService {
         return serviceInfo;
     }
     @Override
-    public Class getExtractorClass() {
-        return YoutubeExtractor.class;
+    public Extractor getExtractorInstance() {
+        return (Extractor) new YoutubeExtractor();
     }
     @Override
-    public Class getSearchEngineClass() {
-        return YoutubeSearchEngine.class;
+    public SearchEngine getSearchEngineInstance() {
+        return (SearchEngine) new YoutubeSearchEngine();
     }
     @Override
     public boolean acceptUrl(String videoUrl) {

From 627e987bdae7c423ba250c9c2266e984c74d3222 Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Mon, 2 Nov 2015 21:19:18 +0000
Subject: [PATCH 2/7] made the PlayVideoActivity return to its
 VideoItemDetailActivity when the back button is pressed, by setting its
 parent activity in the manifest. Also grammar fixes for existing comments

---
 app/src/main/AndroidManifest.xml                  |  1 +
 .../java/org/schabi/newpipe/StreamingService.java |  6 +++---
 .../schabi/newpipe/VideoItemDetailActivity.java   |  2 +-
 .../org/schabi/newpipe/VideoItemListFragment.java |  7 ++-----
 .../schabi/newpipe/youtube/YoutubeExtractor.java  |  2 +-
 .../newpipe/youtube/YoutubeSearchEngine.java      | 15 +++++++--------
 .../schabi/newpipe/youtube/YoutubeService.java    |  4 ++--
 7 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 83c0b9752..07029455e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,6 +68,7 @@
         <activity android:name=".PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:theme="@style/FullscreenTheme"
+            android:parentActivityName=".VideoItemDetailActivity"
             >
         </activity>
         <activity
diff --git a/app/src/main/java/org/schabi/newpipe/StreamingService.java b/app/src/main/java/org/schabi/newpipe/StreamingService.java
index e82a1db82..58185a5fe 100644
--- a/app/src/main/java/org/schabi/newpipe/StreamingService.java
+++ b/app/src/main/java/org/schabi/newpipe/StreamingService.java
@@ -24,9 +24,9 @@ public interface StreamingService {
     class ServiceInfo {
         public String name = "";
     }
-    public ServiceInfo getServiceInfo();
-    public Extractor getExtractorInstance();
-    public SearchEngine getSearchEngineInstance();
+    ServiceInfo getServiceInfo();
+    Extractor getExtractorInstance();
+    SearchEngine getSearchEngineInstance();
 
     /**When a VIEW_ACTION is caught this function will test if the url delivered within the calling
     Intent was meant to be watched with this Service.
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
index 3f7860594..ad63d8add 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -69,7 +69,7 @@ public class VideoItemDetailActivity extends AppCompatActivity {
                         arguments.putInt(VideoItemDetailFragment.STREAMING_SERVICE, i);
                         try {
                             currentStreamingService = i;
-                            extractor = (Extractor) ServiceList.getService(i)
+                            extractor = ServiceList.getService(i)
                                     .getExtractorInstance();
                         } catch (Exception e) {
                             e.printStackTrace();
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index d51cbdc49..9f8658fb7 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -172,7 +172,8 @@ public class VideoItemListFragment extends ListFragment {
     private void startSearch(String query, int page) {
         currentRequestId++;
         terminateThreads();
-        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(), query, page, currentRequestId);
+        searchRunnable = new SearchRunnable(streamingService.getSearchEngineInstance(),
+                                            query, page, currentRequestId);
         searchThread = new Thread(searchRunnable);
         searchThread.start();
     }
@@ -227,10 +228,6 @@ public class VideoItemListFragment extends ListFragment {
         }
     }
 
-    void displayList() {
-
-    }
-
     /**
      * The serialization (saved instance state) Bundle key representing the
      * activated item position. Only used on tablets.
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
index 47e00b2a9..8c0eb48bd 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -199,7 +199,7 @@ public class YoutubeExtractor implements Extractor {
                 videoInfo.audioStreams = parseDashManifest(dashManifest, decryptionCode);
             } catch (Exception e) {
                 //todo: check if the following statement is true
-                Log.e(TAG, "Dash manifest seems not to bee available.");
+                Log.e(TAG, "Dash manifest doesn't seem to be available.");
                 e.printStackTrace();
             }
 
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
index 841d0a89b..a59c67295 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeSearchEngine.java
@@ -57,14 +57,14 @@ public class YoutubeSearchEngine implements SearchEngine {
         int i = 0;
         for(Element item : list.children()) {
             i++;
-            /* First we need to determine witch kind of item we are working with.
-               Youtube depicts fife different kinds if items at its search result page. These are
-               regular videos, playlists, channels, two types of video suggestions, and a no video
-               found item. Since we only want videos, we net to filter out all the others.
+            /* First we need to determine which kind of item we are working with.
+               Youtube depicts five different kinds of items on its search result page. These are
+               regular videos, playlists, channels, two types of video suggestions, and a "no video
+               found" item. Since we only want videos, we need to filter out all the others.
                An example for this can be seen here:
                https://www.youtube.com/results?search_query=asdf&page=1
 
-               We already applied a filter to the url, so we don't need to care about channels, and
+               We already applied a filter to the url, so we don't need to care about channels and
                playlists now.
             */
 
@@ -102,9 +102,9 @@ public class YoutubeSearchEngine implements SearchEngine {
                 Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
                         .select("img").first();
                 resultItem.thumbnail_url = te.attr("abs:src");
-                // Sometimes youtube sends links to gif files witch somehow seam to not exist
+                // Sometimes youtube sends links to gif files which somehow seem to not exist
                 // anymore. Items with such gif also offer a secondary image source. So we are going
-                // to use that if we caught such an item.
+                // to use that if we've caught such an item.
                 if(resultItem.thumbnail_url.contains(".gif")) {
                     resultItem.thumbnail_url = te.attr("abs:data-thumb");
                 }
@@ -113,7 +113,6 @@ public class YoutubeSearchEngine implements SearchEngine {
                 Log.e(TAG, "GREAT FUCKING ERROR");
             }
         }
-
         return result;
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
index dd9fa4397..ee33fdd85 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeService.java
@@ -34,11 +34,11 @@ public class YoutubeService implements StreamingService {
     }
     @Override
     public Extractor getExtractorInstance() {
-        return (Extractor) new YoutubeExtractor();
+        return new YoutubeExtractor();
     }
     @Override
     public SearchEngine getSearchEngineInstance() {
-        return (SearchEngine) new YoutubeSearchEngine();
+        return new YoutubeSearchEngine();
     }
     @Override
     public boolean acceptUrl(String videoUrl) {

From 4106a984ca54aee66ddcb85715927633c2bbf1b0 Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Tue, 3 Nov 2015 11:51:18 +0000
Subject: [PATCH 3/7] minor corrections pre-sync

---
 .idea/gradle.xml                                             | 4 ++--
 app/app.iml                                                  | 4 ++--
 app/src/main/java/org/schabi/newpipe/Downloader.java         | 2 --
 app/src/main/java/org/schabi/newpipe/VideoInfo.java          | 5 ++---
 .../java/org/schabi/newpipe/VideoItemDetailActivity.java     | 1 -
 5 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0833b17cd..2662c5220 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -16,4 +16,4 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/app/app.iml b/app/app.iml
index eefc8deb7..ea1a882b2 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -26,7 +26,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
@@ -100,4 +100,4 @@
     <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
   </component>
-</module>
\ No newline at end of file
+</module>
diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java
index 9b9afb32d..edf839ac2 100644
--- a/app/src/main/java/org/schabi/newpipe/Downloader.java
+++ b/app/src/main/java/org/schabi/newpipe/Downloader.java
@@ -1,7 +1,5 @@
 package org.schabi.newpipe;
 
-import android.widget.Toast;
-
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfo.java b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
index f3778b101..0e0e149dc 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfo.java
@@ -106,10 +106,9 @@ public class VideoInfo {
         public String resolution = "";
     }
 
-    protected static void formatNotKnown(int id)
-    {
+    protected static void formatNotKnown(int id) {
         Log.e(TAG, "format not known: \"" +
-            Integer.toString(id) + "\". Call the programmer, he messed it up!");
+            Integer.toString(id) + "\". Call the programmers, they messed it up!");
     }
 
     public static class AudioStream {
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
index 4c38e8624..370ac2fb2 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailActivity.java
@@ -29,7 +29,6 @@ import android.widget.Toast;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/***/
 public class VideoItemDetailActivity extends AppCompatActivity {
 
     private static final String TAG = VideoItemDetailActivity.class.toString();

From 7e193751c485d7586b5a99ed704a61afe578e8c8 Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Tue, 3 Nov 2015 12:08:30 +0000
Subject: [PATCH 4/7] fixed app/app.iml, .idea/grade.xml and .idea/misc.xml
 siwtching jdk versions between 1.7 and 1.8. Added them to my local .gitignore

---
 .gitignore     |  3 +++
 .idea/misc.xml |  4 ++--
 app/.gitignore |  2 ++
 app/app.iml    | 12 ++++++------
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9c4de5825..9e371177f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+.gitignore
 .gradle
 /local.properties
 /.idea/workspace.xml
@@ -5,3 +6,5 @@
 .DS_Store
 /build
 /captures
+#.idea/gradle.xml
+#.idea/misc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a3eaffb4..9d85fe3d6 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,10 +37,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/app/.gitignore b/app/.gitignore
index 796b96d1c..a7d25c7ea 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1 +1,3 @@
+.gitignore
 /build
+
diff --git a/app/app.iml b/app/app.iml
index ea1a882b2..58221a4e6 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -26,7 +26,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
     <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
     <exclude-output />
@@ -92,12 +92,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
-</module>
+</module>
\ No newline at end of file

From 3c72113f4ccde069778ed77a40618e96be8f49ba Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Tue, 3 Nov 2015 12:56:11 +0000
Subject: [PATCH 5/7] replaced 4-line regex blocks with call to equivalent
 method; removed unecessary try-catch blocks surrounding them: regex methods
 don't throw runtime exceptions

---
 .idea/gradle.xml                              |  4 +-
 .idea/misc.xml                                |  4 +-
 app/app.iml                                   |  8 +-
 .../newpipe/youtube/YoutubeExtractor.java     | 78 +++++++------------
 4 files changed, 34 insertions(+), 60 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 2662c5220..0833b17cd 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
@@ -16,4 +16,4 @@
       </GradleProjectSettings>
     </option>
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 9d85fe3d6..1a3eaffb4 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,10 +37,10 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
-</project>
+</project>
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
index 58221a4e6..eefc8deb7 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -92,12 +92,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
-    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
index 02d35dd10..4cacde7c1 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -3,6 +3,7 @@ package org.schabi.newpipe.youtube;
 import android.util.Log;
 import android.util.Xml;
 
+import org.json.JSONException;
 import org.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
@@ -141,14 +142,7 @@ public class YoutubeExtractor implements Extractor {
 
         Document doc = Jsoup.parse(site, siteUrl);
 
-        try {
-            Pattern p = Pattern.compile("v=([0-9a-zA-Z]*)");
-            Matcher m = p.matcher(siteUrl);
-            m.find();
-            videoInfo.id = m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        videoInfo.id = matchGroup1("v=([0-9a-zA-Z]*)", siteUrl);
 
         videoInfo.age_limit = 0;
         videoInfo.webpage_url = siteUrl;
@@ -160,16 +154,14 @@ public class YoutubeExtractor implements Extractor {
         JSONObject ytAssets = null;
         String dashManifest;
         {
-            Pattern p = Pattern.compile("ytplayer.config\\s*=\\s*(\\{.*?\\});");
-            Matcher m = p.matcher(site);
-            m.find();
+            String jsonString = matchGroup1("ytplayer.config\\s*=\\s*(\\{.*?\\});", site);
 
             try {
-                playerArgs = (new JSONObject(m.group(1)))
-                        .getJSONObject("args");
-                ytAssets = (new JSONObject(m.group(1)))
-                        .getJSONObject("assets");
-            }catch (Exception e) {
+                JSONObject jsonObj = new JSONObject(jsonString);
+                playerArgs = jsonObj.getJSONObject("args");
+                ytAssets = jsonObj.getJSONObject("assets");
+            }
+            catch (Exception e) {
                 e.printStackTrace();
                 // If we fail in this part the video is most likely not available.
                 // Determining why is done later.
@@ -263,15 +255,9 @@ public class YoutubeExtractor implements Extractor {
         // upload date
         videoInfo.upload_date = doc.select("strong[class=\"watch-time-text\"").first()
                 .text();
+
         // Try to only use date not the text around it
-        try {
-            Pattern p = Pattern.compile("([0-9.]*$)");
-            Matcher m = p.matcher(videoInfo.upload_date);
-            m.find();
-            videoInfo.upload_date = m.group(1);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+        videoInfo.upload_date = matchGroup1("([0-9.]*$)", videoInfo.upload_date);
 
         // description
         videoInfo.description = doc.select("p[id=\"eow-description\"]").first()
@@ -324,14 +310,10 @@ public class YoutubeExtractor implements Extractor {
         if(!dashManifest.contains("/signature/")) {
             String encryptedSig = "";
             String decryptedSig;
-            try {
-                Pattern p = Pattern.compile("/s/([a-fA-F0-9\\.]+)");
-                Matcher m = p.matcher(dashManifest);
-                m.find();
-                encryptedSig = m.group(1);
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+
+            //regex methods do not throw runtime exceptions, if their arguments are valid
+            encryptedSig = matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifest);
+
             decryptedSig = decryptSignature(encryptedSig, decryptoinCode);
             dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
         }
@@ -396,10 +378,7 @@ public class YoutubeExtractor implements Extractor {
         info.webpage_url = li.select("a[class*=\"content-link\"]").first()
                 .attr("abs:href");
         try {
-            Pattern p = Pattern.compile("v=([0-9a-zA-Z-]*)");
-            Matcher m = p.matcher(info.webpage_url);
-            m.find();
-            info.id=m.group(1);
+            info.id = matchGroup1("v=([0-9a-zA-Z-]*)", info.webpage_url);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -446,27 +425,15 @@ public class YoutubeExtractor implements Extractor {
         String decryptionCode;
 
         try {
-            Pattern p = Pattern.compile("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(");
-            Matcher m = p.matcher(playerCode);
-            m.find();
-            decryptionFuncName = m.group(1);
+            decryptionFuncName = matchGroup1("\\.sig\\|\\|([a-zA-Z0-9$]+)\\(", playerCode);
 
             String functionPattern = "(function " + decryptionFuncName.replace("$", "\\$") + "\\([a-zA-Z0-9_]*\\)\\{.+?\\})";
-            p = Pattern.compile(functionPattern);
-            m = p.matcher(playerCode);
-            m.find();
-            decryptionFunc = m.group(1);
+            decryptionFunc = matchGroup1(functionPattern, playerCode);
 
-            p = Pattern.compile(";([A-Za-z0-9_\\$]{2})\\...\\(");
-            m = p.matcher(decryptionFunc);
-            m.find();
-            helperObjectName = m.group(1);
+            helperObjectName = matchGroup1(";([A-Za-z0-9_\\$]{2})\\...\\(", decryptionFunc);
 
             String helperPattern = "(var " + helperObjectName.replace("$", "\\$") + "=\\{.+?\\}\\};)function";
-            p = Pattern.compile(helperPattern);
-            m = p.matcher(playerCode);
-            m.find();
-            helperObject = m.group(1);
+            helperObject = matchGroup1(helperPattern, playerCode);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -493,4 +460,11 @@ public class YoutubeExtractor implements Extractor {
         Context.exit();
         return result.toString();
     }
+
+    private String matchGroup1(String pattern, String input) {
+        Pattern pat = Pattern.compile(pattern);
+        Matcher mat = pat.matcher(input);
+        mat.find();
+        return mat.group(1);
+    }
 }

From a18353df5f3bd377c1d088cd1b611d71841e18fd Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Tue, 3 Nov 2015 13:19:23 +0000
Subject: [PATCH 6/7] still fighting with jdk version strings in app/app.iml,
 .idea/gradle.xml, .idea/misc.xml

---
 .idea/gradle.xml                                          | 2 +-
 .idea/misc.xml                                            | 2 +-
 app/.gitignore                                            | 2 +-
 app/app.iml                                               | 8 ++++----
 .../java/org/schabi/newpipe/youtube/YoutubeExtractor.java | 5 +----
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0833b17cd..bd4202cb3 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1a3eaffb4..5d1998103 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/.gitignore b/app/.gitignore
index a7d25c7ea..0d0d2abc0 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,3 +1,3 @@
 .gitignore
 /build
-
+#app/app.iml
diff --git a/app/app.iml b/app/app.iml
index eefc8deb7..58221a4e6 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -92,12 +92,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
-    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
     <orderEntry type="library" exported="" name="jsoup-1.8.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="rhino-1.7.7" level="project" />
+    <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
index 4cacde7c1..223b200e3 100644
--- a/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/youtube/YoutubeExtractor.java
@@ -308,12 +308,9 @@ public class YoutubeExtractor implements Extractor {
 
     private VideoInfo.AudioStream[] parseDashManifest(String dashManifest, String decryptoinCode) {
         if(!dashManifest.contains("/signature/")) {
-            String encryptedSig = "";
+            String encryptedSig = matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifest);
             String decryptedSig;
 
-            //regex methods do not throw runtime exceptions, if their arguments are valid
-            encryptedSig = matchGroup1("/s/([a-fA-F0-9\\.]+)", dashManifest);
-
             decryptedSig = decryptSignature(encryptedSig, decryptoinCode);
             dashManifest = dashManifest.replace("/s/" + encryptedSig, "/signature/" + decryptedSig);
         }

From 9546a276dc2b03b8bc100cd500412869b067af00 Mon Sep 17 00:00:00 2001
From: Adam Howard <medavox2+github@gmail.com>
Date: Tue, 3 Nov 2015 13:20:15 +0000
Subject: [PATCH 7/7] modified gitignore so jdk versions changes are hopefully
 not propagated to remote

---
 .gitignore     | 4 ++--
 app/.gitignore | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9e371177f..09cade508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,5 @@
 .DS_Store
 /build
 /captures
-#.idea/gradle.xml
-#.idea/misc.xml
+.idea/gradle.xml
+.idea/misc.xml
diff --git a/app/.gitignore b/app/.gitignore
index 0d0d2abc0..6bcbd4f70 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,3 +1,3 @@
 .gitignore
 /build
-#app/app.iml
+app/app.iml