From 27a2dee3bd14736863bb694b9f53d8a9cb4c8a86 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Wed, 24 Feb 2016 23:12:02 +0100
Subject: [PATCH 01/22] created error report activity

---
 app/src/main/AndroidManifest.xml              | 44 ++++++----
 .../schabi/newpipe/VideoItemListActivity.java |  7 ++
 .../schabi/newpipe/VideoItemListFragment.java |  1 -
 .../newpipe/errorhandling/ErrorActivity.java  | 15 ++++
 app/src/main/res/layout/activity_error.xml    | 87 +++++++++++++++++++
 app/src/main/res/values-w820dp/dimens.xml     |  6 ++
 app/src/main/res/values/dimens.xml            |  3 +
 app/src/main/res/values/strings.xml           |  3 +
 8 files changed, 146 insertions(+), 20 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
 create mode 100644 app/src/main/res/layout/activity_error.xml
 create mode 100644 app/src/main/res/values-w820dp/dimens.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 323da8bd6..618290f94 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="org.schabi.newpipe" >
-    <uses-permission android:name= "android.permission.INTERNET" />
-    <uses-permission android:name= "android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    package="org.schabi.newpipe">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
     <application
         android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
-        android:logo="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:logo="@mipmap/ic_launcher"
         android:theme="@style/AppTheme"
         tools:ignore="AllowBackup">
         <activity
             android:name=".VideoItemListActivity"
-            android:label="@string/app_name"
-            android:configChanges="orientation|screenSize">
+            android:configChanges="orientation|screenSize"
+            android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -26,10 +28,10 @@
         </activity>
         <activity
             android:name=".VideoItemDetailActivity"
-            android:label="@string/title_videoitem_detail"
-            android:theme="@style/AppTheme"
             android:configChanges="orientation|screenSize"
-            android:screenOrientation="portrait">
+            android:label="@string/title_videoitem_detail"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".VideoItemListActivity" />
@@ -76,20 +78,21 @@
                 <data android:scheme="vnd.youtube.launch" />
             </intent-filter>
         </activity>
-        <activity android:name=".PlayVideoActivity"
+        <activity
+            android:name=".PlayVideoActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
-            android:theme="@style/VideoPlayerTheme"
             android:parentActivityName=".VideoItemDetailActivity"
-            tools:ignore="UnusedAttribute">
-        </activity>
+            android:theme="@style/VideoPlayerTheme"
+            tools:ignore="UnusedAttribute"></activity>
+
         <service
             android:name=".BackgroundPlayer"
-            android:label="@string/background_player_name"
-            android:exported="false" />
+            android:exported="false"
+            android:label="@string/background_player_name" />
+
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/settings_activity_title" >
-        </activity>
+            android:label="@string/settings_activity_title"></activity>
         <activity
             android:name=".PanicResponderActivity"
             android:launchMode="singleInstance"
@@ -97,11 +100,14 @@
             android:theme="@android:style/Theme.NoDisplay">
             <intent-filter>
                 <action android:name="info.guardianproject.panic.action.TRIGGER" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
         <activity
             android:name=".ExitActivity"
             android:theme="@android:style/Theme.NoDisplay" />
+        <activity android:name=".errorhandling.ErrorActivity"></activity>
     </application>
+
 </manifest>
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index ae80d6448..71284c99f 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -17,6 +17,7 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
+import org.schabi.newpipe.errorhandling.ErrorActivity;
 import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.SearchEngine;
 import org.schabi.newpipe.extractor.ServiceList;
@@ -240,6 +241,12 @@ public class VideoItemListActivity extends AppCompatActivity
         }
 
         PreferenceManager.setDefaultValues(this, R.xml.settings, false);
+
+
+        /* this is for debuging only if this is still pressent in master branch kill the programmer */
+        startActivity(new Intent(this, ErrorActivity.class));
+
+        //-------------------------------------------------------------------------
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index e6a6a5060..75f80f7ae 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -17,7 +17,6 @@ import java.io.IOException;
 import java.util.List;
 
 import org.schabi.newpipe.extractor.ExtractionException;
-import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.VideoPreviewInfo;
 import org.schabi.newpipe.extractor.SearchEngine;
 import org.schabi.newpipe.extractor.StreamingService;
diff --git a/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
new file mode 100644
index 000000000..6529fa188
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
@@ -0,0 +1,15 @@
+package org.schabi.newpipe.errorhandling;
+
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+
+import org.schabi.newpipe.R;
+
+public class ErrorActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_error);
+    }
+}
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
new file mode 100644
index 000000000..378c66bdb
--- /dev/null
+++ b/app/src/main/res/layout/activity_error.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.schabi.newpipe.errorhandling.ErrorActivity">
+
+    <ScrollView
+        android:id="@+id/scrollView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingBottom="@dimen/activity_vertical_margin"
+            android:paddingLeft="@dimen/activity_horizontal_margin"
+            android:paddingRight="@dimen/activity_horizontal_margin"
+            android:paddingTop="@dimen/activity_vertical_margin">
+
+            <TextView
+                android:id="@+id/errorSorryView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceLarge"
+                android:text="@string/sorry_string"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/errorWhatHappenedView"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="What happened:"/>
+
+            <HorizontalScrollView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/horizontalScrollView"
+                android:layout_gravity="center" >
+                <TextView
+                    android:id="@+id/errorView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:typeface="monospace"
+                    android:text="asdkfjasdhfjshgfgnigregirenigneigheuigeorigjweogijhegiohegojiegoergjeogheoghweoghiehgohewgoiwehogihewrghieogh
+                   &#xA;asdfgeogirejgoeirjgoregjogijegoiwejg
+                   &#xA;wergjergljegoiejgoeigjogjeogjegohgeoigheognmgnbnorneog
+                   &#xA;ergoegremgekgnonhotnhotrnhkhnh
+                   &#xA;safs
+                   &#xA;f
+                   &#xA;s
+                   &#xA;f
+                   &#xA;f
+                   &#xA;f
+                   &#xA;safasf
+                   &#xA;sageoigohntrh
+                   &#xA;trhoijrhoirnhohintrionbobirnionb
+                   &#xA;boitrnobinobnroni
+                   &#xA;sadfsfagfkjgnsfdljhenvgoenvjibnoenpeoignweguihregpiorhnpoithtvhiohöio höio ho fvgegh gsfdsfd
+                   &#xA;sfdaiohsfdiousfdahoiuhsfdaoiusfd oifdhoifdho fvigh fvuigupi refsfdasklsdfhsalkjfhsalkfjsa
+                   &#xA;salgkjsfdgkjreog ehpio vpo hfgoeiwrhpwreo ibbuhwfgeubuh l jhjkb
+
+                   &#xA;ssfda
+                   &#xA;sfda
+                   &#xA;sfda
+                   &#xA;sfda
+&#xA;
+                   &#xA;sagrejgorigjeoigjgkofdjgölkfdjgsdökgjklgjoe
+                   &#xA;sfdafgs
+                   &#xA;dfg
+                   &#xA;sd
+                   &#xA;fg"/>
+            </HorizontalScrollView>
+
+            <Button
+                android:id="@+id/errorReportButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/error_report_button_text" />
+
+        </LinearLayout>
+    </ScrollView>
+
+</FrameLayout>
diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml
new file mode 100644
index 000000000..63fc81644
--- /dev/null
+++ b/app/src/main/res/values-w820dp/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <!-- Example customization of dimensions originally defined in res/values/dimens.xml
+         (such as screen margins) for screens with more than 820dp of available width. This
+         would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 0eb887da1..cba909e4a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -35,5 +35,8 @@
     <!-- Paddings & Margins -->
     <dimen name="video_item_detail_like_margin">6sp</dimen>
     <dimen name="video_item_detail_play_fab_margin">20dp</dimen>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
 
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a4be457fc..a92c7ab33 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,6 +88,9 @@
     <string name="blocked_by_gema">Blocked by GEMA.</string>
     <string name="could_not_setup_download_menu">Could not setup download menu.</string>
     <string name="live_streams_not_supported">This is a LIVE STREAM. These are not yet supported.</string>
+    <!-- error activity -->
+    <string name="sorry_string">Sorry that shouldn#t have happened.</string>
+    <string name="error_report_button_text">Report error via mail</string>
 
 
     <!-- Content descriptions (for better accessibility) -->

From 64c423902ae33efb0068bb3b99165203f1b0739b Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 25 Feb 2016 03:43:13 +0100
Subject: [PATCH 02/22] made error handling work a bit

---
 app/build.gradle                              |   1 +
 app/src/main/AndroidManifest.xml              |   1 +
 .../schabi/newpipe/ActivityCommunicator.java  |   8 +-
 .../newpipe/VideoItemDetailFragment.java      |  21 +++-
 .../schabi/newpipe/VideoItemListActivity.java |   6 -
 .../newpipe/errorhandling/ErrorActivity.java  | 110 ++++++++++++++++++
 app/src/main/res/layout/activity_error.xml    |  31 +----
 app/src/main/res/values/strings.xml           |   3 +-
 8 files changed, 142 insertions(+), 39 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c1f1fb00f..9ee5f1686 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,4 +42,5 @@ dependencies {
     compile 'de.hdodenhof:circleimageview:2.0.0'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
     compile 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'org.apache.directory.studio:org.apache.commons.lang:2.6'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 618290f94..16a8c4999 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -106,6 +106,7 @@
         </activity>
         <activity
             android:name=".ExitActivity"
+            android:label="@string/general_error"
             android:theme="@android:style/Theme.NoDisplay" />
         <activity android:name=".errorhandling.ErrorActivity"></activity>
     </application>
diff --git a/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java b/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
index b09652a6c..92f9d35c8 100644
--- a/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
+++ b/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
@@ -22,10 +22,12 @@ package org.schabi.newpipe;
 
 import android.graphics.Bitmap;
 
+import java.util.List;
+
 /**
  * Singleton:
  * Used to send data between certain Activity/Services within the same process.
- * This can be considered as hack inside the Android universe. **/
+ * This can be considered as an ugly hack inside the Android universe. **/
 public class ActivityCommunicator {
 
     private static ActivityCommunicator activityCommunicator = null;
@@ -39,4 +41,8 @@ public class ActivityCommunicator {
 
     // Thumbnail send from VideoItemDetailFragment to BackgroundPlayer
     public volatile Bitmap backgroundPlayerThumbnail;
+
+    // Sent from any activity to ErrorActivity.
+    public volatile List<Exception> errorList;
+    public volatile Class returnActivity;
 }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 625f1d1dc..5999947d5 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -46,6 +46,7 @@ import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import java.util.ArrayList;
 import java.util.Vector;
 
+import org.schabi.newpipe.errorhandling.ErrorActivity;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.ServiceList;
@@ -166,10 +167,23 @@ public class VideoItemDetailFragment extends Fragment {
                 });
                 e.printStackTrace();
             } catch (ParsingException e) {
-                postNewErrorToast(h, e.getMessage());
+                ErrorActivity.reportError(h, getActivity(), e, 0, VideoItemListActivity.class);
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        getActivity().finish();
+                    }
+                });
                 e.printStackTrace();
             } catch(Exception e) {
-                postNewErrorToast(h, R.string.general_error);
+                ErrorActivity.reportError(h, getActivity(), e,
+                        R.string.general_error, VideoItemListActivity.class);
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        getActivity().finish();
+                    }
+                });
                 e.printStackTrace();
             } finally {
                 if(videoInfo != null &&
@@ -178,6 +192,9 @@ public class VideoItemDetailFragment extends Fragment {
                     for(Exception e : videoInfo.errors) {
                         e.printStackTrace();
                     }
+                    //todo: do not call directly ask the user if it should be reported
+                    ErrorActivity.reportError(h, getActivity(),
+                            videoInfo.errors, 0, VideoItemDetailActivity.class);
                 }
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index 71284c99f..1db977fd0 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -241,12 +241,6 @@ public class VideoItemListActivity extends AppCompatActivity
         }
 
         PreferenceManager.setDefaultValues(this, R.xml.settings, false);
-
-
-        /* this is for debuging only if this is still pressent in master branch kill the programmer */
-        startActivity(new Intent(this, ErrorActivity.class));
-
-        //-------------------------------------------------------------------------
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
index 6529fa188..25a17e6e7 100644
--- a/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
@@ -1,15 +1,125 @@
 package org.schabi.newpipe.errorhandling;
 
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.os.Handler;
+import android.view.MenuItem;
+import android.widget.TextView;
 
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.VideoItemListActivity;
+
+import java.util.List;
+import java.util.Vector;
 
 public class ErrorActivity extends AppCompatActivity {
 
+    private List<Exception> errorList;
+    private Class returnActivity;
+
+    // views
+    private TextView errorView;
+
+    public static void reportError(Context context, List<Exception> el, int message, Class returnAcitivty) {
+        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+        ac.errorList = el;
+        ac.returnActivity = returnAcitivty;
+        Intent intent = new Intent(context, ErrorActivity.class);
+        context.startActivity(intent);
+    }
+
+    public static void reportError(Context context, Exception e, int message, Class returnAcitivty) {
+        List<Exception> el = new Vector<>();
+        el.add(e);
+        reportError(context, el, message, returnAcitivty);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context,
+                                   final Exception e, final int message, final Class returnAcitivty) {
+        List<Exception> el = new Vector<>();
+        el.add(e);
+        reportError(handler, context, el, message, returnAcitivty);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context,
+                                   final List<Exception> el, final int message, final Class returnAcitivty) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                reportError(context, el, message, returnAcitivty);
+            }
+        });
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_error);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+        errorList = ac.errorList;
+        returnActivity = ac.returnActivity;
+
+        errorView = (TextView) findViewById(R.id.errorView);
+        errorView.setText(formErrorText(errorList));
+
+        //importand add gurumeditaion
+        addGuruMeditaion();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            goToReturnActivity();
+            return true;
+        }
+        return false;
+    }
+
+    private String formErrorText(List<Exception> el) {
+        String text = "";
+        for(Exception e : el) {
+            text += "-------------------------------------\n"
+                    + ExceptionUtils.getStackTrace(e);
+        }
+        text += "-------------------------------------";
+        return text;
+    }
+
+    private void goToReturnActivity() {
+        Intent intent;
+        if(returnActivity != null &&
+                returnActivity.isAssignableFrom(Activity.class)) {
+            intent = new Intent(this, returnActivity);
+        } else {
+            intent = new Intent(this, VideoItemListActivity.class);
+        }
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        NavUtils.navigateUpTo(this, intent);
+    }
+
+    private void addGuruMeditaion() {
+        //just an easter egg
+        TextView sorryView = (TextView) findViewById(R.id.errorSorryView);
+        String text = sorryView.getText().toString();
+        text += "\n" + getString(R.string.guru_meditation);
+        sorryView.setText(text);
+    }
+
+    @Override
+    public void onBackPressed() {
+        super.onBackPressed();
+        goToReturnActivity();
     }
 }
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 378c66bdb..8a9ae8e7b 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -24,6 +24,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceLarge"
+                android:gravity="center"
                 android:text="@string/sorry_string"
                 android:textStyle="bold" />
 
@@ -44,35 +45,7 @@
                     android:id="@+id/errorView"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:typeface="monospace"
-                    android:text="asdkfjasdhfjshgfgnigregirenigneigheuigeorigjweogijhegiohegojiegoergjeogheoghweoghiehgohewgoiwehogihewrghieogh
-                   &#xA;asdfgeogirejgoeirjgoregjogijegoiwejg
-                   &#xA;wergjergljegoiejgoeigjogjeogjegohgeoigheognmgnbnorneog
-                   &#xA;ergoegremgekgnonhotnhotrnhkhnh
-                   &#xA;safs
-                   &#xA;f
-                   &#xA;s
-                   &#xA;f
-                   &#xA;f
-                   &#xA;f
-                   &#xA;safasf
-                   &#xA;sageoigohntrh
-                   &#xA;trhoijrhoirnhohintrionbobirnionb
-                   &#xA;boitrnobinobnroni
-                   &#xA;sadfsfagfkjgnsfdljhenvgoenvjibnoenpeoignweguihregpiorhnpoithtvhiohöio höio ho fvgegh gsfdsfd
-                   &#xA;sfdaiohsfdiousfdahoiuhsfdaoiusfd oifdhoifdho fvigh fvuigupi refsfdasklsdfhsalkjfhsalkfjsa
-                   &#xA;salgkjsfdgkjreog ehpio vpo hfgoeiwrhpwreo ibbuhwfgeubuh l jhjkb
-
-                   &#xA;ssfda
-                   &#xA;sfda
-                   &#xA;sfda
-                   &#xA;sfda
-&#xA;
-                   &#xA;sagrejgorigjeoigjgkofdjgölkfdjgsdökgjklgjoe
-                   &#xA;sfdafgs
-                   &#xA;dfg
-                   &#xA;sd
-                   &#xA;fg"/>
+                    android:typeface="monospace"/>
             </HorizontalScrollView>
 
             <Button
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a92c7ab33..1f5e32c9b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,8 @@
     <string name="could_not_setup_download_menu">Could not setup download menu.</string>
     <string name="live_streams_not_supported">This is a LIVE STREAM. These are not yet supported.</string>
     <!-- error activity -->
-    <string name="sorry_string">Sorry that shouldn#t have happened.</string>
+    <string name="sorry_string">Sorry that should not happen.</string>
+    <string name="guru_meditation" translatable="false">Guru Meditation.</string>
     <string name="error_report_button_text">Report error via mail</string>
 
 

From 7caf7be97e9d1d3039a37670faed00a2459a19c4 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 25 Feb 2016 22:02:42 +0100
Subject: [PATCH 03/22] add info box

---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../schabi/newpipe/ActivityCommunicator.java  |   1 +
 .../org/schabi/newpipe/ErrorActivity.java     | 210 ++++++++++++++++++
 .../newpipe/VideoItemDetailFragment.java      |  42 ++--
 .../schabi/newpipe/VideoItemListActivity.java |   2 -
 .../newpipe/errorhandling/ErrorActivity.java  | 125 -----------
 .../extractor/ExtractionException.java        |   2 -
 .../newpipe/extractor/ParsingException.java   |   1 -
 .../newpipe/extractor/StreamExtractor.java    |   2 -
 .../youtube/YoutubeStreamExtractor.java       |   9 +-
 app/src/main/res/layout/activity_error.xml    |  44 +++-
 app/src/main/res/values/strings.xml           |   8 +
 12 files changed, 291 insertions(+), 157 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/ErrorActivity.java
 delete mode 100644 app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 16a8c4999..64b7aec4f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -108,7 +108,7 @@
             android:name=".ExitActivity"
             android:label="@string/general_error"
             android:theme="@android:style/Theme.NoDisplay" />
-        <activity android:name=".errorhandling.ErrorActivity"></activity>
+        <activity android:name=".ErrorActivity"></activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java b/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
index 92f9d35c8..4ea6ca657 100644
--- a/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
+++ b/app/src/main/java/org/schabi/newpipe/ActivityCommunicator.java
@@ -45,4 +45,5 @@ public class ActivityCommunicator {
     // Sent from any activity to ErrorActivity.
     public volatile List<Exception> errorList;
     public volatile Class returnActivity;
+    public volatile ErrorActivity.ErrorInfo errorInfo;
 }
diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
new file mode 100644
index 000000000..4e4095be2
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -0,0 +1,210 @@
+package org.schabi.newpipe;
+
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.preference.PreferenceManager;
+import android.support.design.widget.Snackbar;
+import android.support.v4.app.NavUtils;
+import android.support.v7.app.AppCompatActivity;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import org.apache.commons.lang.exception.ExceptionUtils;
+
+import java.util.List;
+import java.util.Vector;
+
+public class ErrorActivity extends AppCompatActivity {
+
+    public static class ErrorInfo {
+        public int userAction;
+        public String request;
+        public String serviceName;
+        public int message;
+
+        public static ErrorInfo make(int userAction, String serviceName, String request, int message) {
+            ErrorInfo info = new ErrorInfo();
+            info.userAction = userAction;
+            info.serviceName = serviceName;
+            info.request = request;
+            info.message = message;
+            return info;
+        }
+    }
+
+    public static final String TAG = ErrorActivity.class.toString();
+    public static final int SEARCHED = 0;
+    public static final int REQUESTED_STREAM = 1;
+    public static final String SEARCHED_STRING = "Searched";
+    public static final String REQUESTED_STREAM_STRING = "Requested Stream";
+
+    private List<Exception> errorList;
+    private ErrorInfo errorInfo;
+    private Class returnActivity;
+
+    // views
+    private TextView errorView;
+
+    public static void reportError(final Context context, final List<Exception> el,
+                                   final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
+        if(rootView != null) {
+            Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
+                    .setAction(R.string.error_snackbar_action, new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+                            ac.errorList = el;
+                            ac.returnActivity = returnAcitivty;
+                            ac.errorInfo = errorInfo;
+                            Intent intent = new Intent(context, ErrorActivity.class);
+                            context.startActivity(intent);
+                        }
+                    }).show();
+        } else {
+            ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+            ac.errorList = el;
+            ac.returnActivity = returnAcitivty;
+            Intent intent = new Intent(context, ErrorActivity.class);
+            context.startActivity(intent);
+        }
+    }
+
+    public static void reportError(final Context context, final Exception e,
+                                   final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
+        List<Exception> el = new Vector<>();
+        el.add(e);
+        reportError(context, el, returnAcitivty, rootView, errorInfo);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context, final Exception e,
+                                   final Class returnAcitivty, final View rootView, final ErrorInfo errorInfo) {
+        List<Exception> el = new Vector<>();
+        el.add(e);
+        reportError(handler, context, el, returnAcitivty, rootView, errorInfo);
+    }
+
+    // async call
+    public static void reportError(Handler handler, final Context context, final List<Exception> el,
+                                   final Class returnAcitivty, final View rootView, final ErrorInfo errorInfo) {
+        handler.post(new Runnable() {
+            @Override
+            public void run() {
+                reportError(context, el, returnAcitivty, rootView, errorInfo);
+            }
+        });
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_error);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
+        errorList = ac.errorList;
+        returnActivity = ac.returnActivity;
+        errorInfo = ac.errorInfo;
+
+        errorView = (TextView) findViewById(R.id.errorView);
+
+        errorView.setText(formErrorText(errorList));
+
+        //importand add gurumeditaion
+        addGuruMeditaion();
+        buildInfo(errorInfo);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            goToReturnActivity();
+            return true;
+        }
+        return false;
+    }
+
+    private String formErrorText(List<Exception> el) {
+        String text = "";
+        for(Exception e : el) {
+            text += "-------------------------------------\n"
+                    + ExceptionUtils.getStackTrace(e);
+        }
+        text += "-------------------------------------";
+        return text;
+    }
+
+    private void goToReturnActivity() {
+        if(returnActivity == null) {
+            super.onBackPressed();
+        } else {
+            Intent intent;
+            if (returnActivity != null &&
+                    returnActivity.isAssignableFrom(Activity.class)) {
+                intent = new Intent(this, returnActivity);
+            } else {
+                intent = new Intent(this, VideoItemListActivity.class);
+            }
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            NavUtils.navigateUpTo(this, intent);
+        }
+    }
+
+    private void buildInfo(ErrorInfo info) {
+        TextView infoLabelView = (TextView) findViewById(R.id.errorInfoLabelsView);
+        TextView infoView = (TextView) findViewById(R.id.errorInfosView);
+        String text = "";
+
+        infoLabelView.setText(getString(R.string.info_labels).replace("\\n", "\n"));
+
+        String whatString = "";
+        switch (info.userAction) {
+            case REQUESTED_STREAM:
+                whatString = REQUESTED_STREAM_STRING;
+                break;
+            case SEARCHED:
+                whatString = SEARCHED_STRING;
+                break;
+            default:
+                whatString = "Your description is in another castle.";
+        }
+
+        String contentLang = PreferenceManager.getDefaultSharedPreferences(this)
+                .getString(this.getString(R.string.search_language_key), "none");
+
+        String osBase = Build.VERSION.SDK_INT >= 23 ? Build.VERSION.BASE_OS : "Android";
+        String osString = (osBase.isEmpty() ? "Android" : osBase)
+                + " " + Build.VERSION.RELEASE;
+
+        text += whatString
+                + "\n" + info.request
+                + "\n" + contentLang
+                + "\n" + info.serviceName
+                + "\n" + BuildConfig.VERSION_NAME
+                + "\n" + osString;
+
+        infoView.setText(text);
+    }
+
+    private void addGuruMeditaion() {
+        //just an easter egg
+        TextView sorryView = (TextView) findViewById(R.id.errorSorryView);
+        String text = sorryView.getText().toString();
+        text += "\n" + getString(R.string.guru_meditation);
+        sorryView.setText(text);
+    }
+
+    @Override
+    public void onBackPressed() {
+        //super.onBackPressed();
+        goToReturnActivity();
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 5999947d5..05271e798 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -46,7 +46,6 @@ import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 import java.util.ArrayList;
 import java.util.Vector;
 
-import org.schabi.newpipe.errorhandling.ErrorActivity;
 import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.ServiceList;
@@ -167,23 +166,26 @@ public class VideoItemDetailFragment extends Fragment {
                 });
                 e.printStackTrace();
             } catch (ParsingException e) {
-                ErrorActivity.reportError(h, getActivity(), e, 0, VideoItemListActivity.class);
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        getActivity().finish();
-                    }
-                });
+                ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.parsing_error));
+                        h.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                getActivity().finish();
+                            }
+                        });
                 e.printStackTrace();
             } catch(Exception e) {
-                ErrorActivity.reportError(h, getActivity(), e,
-                        R.string.general_error, VideoItemListActivity.class);
-                h.post(new Runnable() {
-                    @Override
-                    public void run() {
-                        getActivity().finish();
-                    }
-                });
+                ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                service.getServiceInfo().name, videoUrl, R.string.general_error));
+                        h.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                getActivity().finish();
+                            }
+                        });
                 e.printStackTrace();
             } finally {
                 if(videoInfo != null &&
@@ -192,9 +194,13 @@ public class VideoItemDetailFragment extends Fragment {
                     for(Exception e : videoInfo.errors) {
                         e.printStackTrace();
                     }
-                    //todo: do not call directly ask the user if it should be reported
+
+                    Activity a = getActivity();
+                    View rootView = a != null ? a.findViewById(R.id.videoitem_detail) : null;
                     ErrorActivity.reportError(h, getActivity(),
-                            videoInfo.errors, 0, VideoItemDetailActivity.class);
+                            videoInfo.errors, null, rootView,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name,  videoUrl, 0 /* no message for the user */));
                 }
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index 1db977fd0..45e4e09cc 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -17,12 +17,10 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
-import org.schabi.newpipe.errorhandling.ErrorActivity;
 import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.SearchEngine;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
deleted file mode 100644
index 25a17e6e7..000000000
--- a/app/src/main/java/org/schabi/newpipe/errorhandling/ErrorActivity.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package org.schabi.newpipe.errorhandling;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.MenuItem;
-import android.widget.TextView;
-
-import org.apache.commons.lang.exception.ExceptionUtils;
-import org.schabi.newpipe.ActivityCommunicator;
-import org.schabi.newpipe.R;
-import org.schabi.newpipe.VideoItemListActivity;
-
-import java.util.List;
-import java.util.Vector;
-
-public class ErrorActivity extends AppCompatActivity {
-
-    private List<Exception> errorList;
-    private Class returnActivity;
-
-    // views
-    private TextView errorView;
-
-    public static void reportError(Context context, List<Exception> el, int message, Class returnAcitivty) {
-        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
-        ac.errorList = el;
-        ac.returnActivity = returnAcitivty;
-        Intent intent = new Intent(context, ErrorActivity.class);
-        context.startActivity(intent);
-    }
-
-    public static void reportError(Context context, Exception e, int message, Class returnAcitivty) {
-        List<Exception> el = new Vector<>();
-        el.add(e);
-        reportError(context, el, message, returnAcitivty);
-    }
-
-    // async call
-    public static void reportError(Handler handler, final Context context,
-                                   final Exception e, final int message, final Class returnAcitivty) {
-        List<Exception> el = new Vector<>();
-        el.add(e);
-        reportError(handler, context, el, message, returnAcitivty);
-    }
-
-    // async call
-    public static void reportError(Handler handler, final Context context,
-                                   final List<Exception> el, final int message, final Class returnAcitivty) {
-        handler.post(new Runnable() {
-            @Override
-            public void run() {
-                reportError(context, el, message, returnAcitivty);
-            }
-        });
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_error);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
-        ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
-        errorList = ac.errorList;
-        returnActivity = ac.returnActivity;
-
-        errorView = (TextView) findViewById(R.id.errorView);
-        errorView.setText(formErrorText(errorList));
-
-        //importand add gurumeditaion
-        addGuruMeditaion();
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        int id = item.getItemId();
-        if (id == android.R.id.home) {
-            goToReturnActivity();
-            return true;
-        }
-        return false;
-    }
-
-    private String formErrorText(List<Exception> el) {
-        String text = "";
-        for(Exception e : el) {
-            text += "-------------------------------------\n"
-                    + ExceptionUtils.getStackTrace(e);
-        }
-        text += "-------------------------------------";
-        return text;
-    }
-
-    private void goToReturnActivity() {
-        Intent intent;
-        if(returnActivity != null &&
-                returnActivity.isAssignableFrom(Activity.class)) {
-            intent = new Intent(this, returnActivity);
-        } else {
-            intent = new Intent(this, VideoItemListActivity.class);
-        }
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        NavUtils.navigateUpTo(this, intent);
-    }
-
-    private void addGuruMeditaion() {
-        //just an easter egg
-        TextView sorryView = (TextView) findViewById(R.id.errorSorryView);
-        String text = sorryView.getText().toString();
-        text += "\n" + getString(R.string.guru_meditation);
-        sorryView.setText(text);
-    }
-
-    @Override
-    public void onBackPressed() {
-        super.onBackPressed();
-        goToReturnActivity();
-    }
-}
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/ExtractionException.java b/app/src/main/java/org/schabi/newpipe/extractor/ExtractionException.java
index 68ded9c26..fbbca89c1 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/ExtractionException.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/ExtractionException.java
@@ -21,8 +21,6 @@ package org.schabi.newpipe.extractor;
  */
 
 public class ExtractionException extends Exception {
-    public ExtractionException() {}
-
     public ExtractionException(String message) {
         super(message);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java b/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
index c978743ba..64951bf49 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
@@ -22,7 +22,6 @@ package org.schabi.newpipe.extractor;
 
 
 public class ParsingException extends ExtractionException {
-    public ParsingException() {}
     public ParsingException(String message) {
         super(message);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
index 2fcea90c2..53bbe317e 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
@@ -29,7 +29,6 @@ import java.util.List;
 public interface StreamExtractor {
 
     public class ExctractorInitException extends ExtractionException {
-        public ExctractorInitException() {}
         public ExctractorInitException(String message) {
             super(message);
         }
@@ -42,7 +41,6 @@ public interface StreamExtractor {
     }
 
     public class ContentNotAvailableException extends ParsingException {
-        public ContentNotAvailableException() {}
         public ContentNotAvailableException(String message) {
             super(message);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index b8dfe9014..0bac36948 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -69,8 +69,8 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     }
 
     public class LiveStreamException extends ContentNotAvailableException {
-        LiveStreamException() {
-            super();
+        LiveStreamException(String message) {
+            super(message);
         }
     }
 
@@ -250,7 +250,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
             throw new ParsingException("Could not parse yt player config", e);
         }
         if (isLiveStream) {
-            throw new LiveStreamException();
+            throw new LiveStreamException("This is a Life stream. Can't use those right now.");
         }
 
         return playerArgs;
@@ -330,6 +330,8 @@ public class YoutubeStreamExtractor implements StreamExtractor {
 
     @Override
     public String getUploader() throws ParsingException {
+        throw new ParsingException("blabla");
+        /*
         try {
             if (playerArgs == null) {
                 return videoInfoPage.get("author");
@@ -345,6 +347,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
         } catch (Exception e) {
             throw new ParsingException("failed permanently to load uploader name.", e);
         }
+        */
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 8a9ae8e7b..0b6fedb5a 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="org.schabi.newpipe.errorhandling.ErrorActivity">
+    tools:context=".ErrorActivity">
 
     <ScrollView
         android:id="@+id/scrollView"
@@ -17,7 +17,9 @@
             android:paddingBottom="@dimen/activity_vertical_margin"
             android:paddingLeft="@dimen/activity_horizontal_margin"
             android:paddingRight="@dimen/activity_horizontal_margin"
-            android:paddingTop="@dimen/activity_vertical_margin">
+            android:paddingTop="@dimen/activity_vertical_margin"
+            android:focusable="true"
+            android:focusableInTouchMode="true">
 
             <TextView
                 android:id="@+id/errorSorryView"
@@ -28,13 +30,49 @@
                 android:text="@string/sorry_string"
                 android:textStyle="bold" />
 
+            <TextView
+                android:id="@+id/errorDeviceHeadlineView"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/what_device_headline"/>
+            
+            <LinearLayout
+                android:id="@+id/errorInfoLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+                
+                <TextView
+                    android:id="@+id/errorInfoLabelsView"
+                    android:layout_weight="1"
+                    android:layout_width="200dp"
+                    android:layout_height="wrap_content"
+                    android:textColor="@android:color/black"
+                    android:text="@string/info_labels"/>
+
+                <HorizontalScrollView
+                    android:layout_weight="1"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
+
+                    <TextView
+                        android:id="@+id/errorInfosView"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content" />
+
+                </HorizontalScrollView>
+
+            </LinearLayout>
+
             <TextView
                 android:id="@+id/errorWhatHappenedView"
                 android:paddingTop="@dimen/activity_vertical_margin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="What happened:"/>
+                android:text="@string/what_happened_headline"/>
 
             <HorizontalScrollView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f5e32c9b..4057b0ac8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -92,6 +92,14 @@
     <string name="sorry_string">Sorry that should not happen.</string>
     <string name="guru_meditation" translatable="false">Guru Meditation.</string>
     <string name="error_report_button_text">Report error via mail</string>
+    <string name="error_snackbar_message">Sorry some errors occurred.</string>
+    <string name="error_snackbar_action">REPORT</string>
+    <string name="what_device_headline">Info:</string>
+    <string name="what_happened_headline">What happened:</string>
+    <string name="info_labels">What:\\nRequest:\\nContent Lang:\\nService:\\nVersion:\\nOS version:</string>
+    <string name="info_searched_lbl">Searched for:</string>
+    <string name="info_requested_stream_lbl">Requested stream:</string>
+    <string name="your_commend">Your commend:</string>
 
 
     <!-- Content descriptions (for better accessibility) -->

From 369d9204d9310e4c3b8a5b57ca7ac7a2a235c16a Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Thu, 25 Feb 2016 23:19:43 +0100
Subject: [PATCH 04/22] add send via mail/share feature

---
 .../org/schabi/newpipe/ErrorActivity.java     | 146 ++++++++++++++----
 .../youtube/YoutubeStreamExtractor.java       |   3 -
 app/src/main/res/layout/activity_error.xml    |  20 ++-
 app/src/main/res/menu/error_menu.xml          |   9 ++
 app/src/main/res/values/strings.xml           |   2 +-
 5 files changed, 146 insertions(+), 34 deletions(-)
 create mode 100644 app/src/main/res/menu/error_menu.xml

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index 4e4095be2..a0875c773 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -1,9 +1,12 @@
-package org.schabi.newpipe;
 
 
+package org.schabi.newpipe;
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.net.MailTo;
+import android.net.Uri;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.support.design.widget.Snackbar;
@@ -11,16 +14,43 @@ import android.support.v4.app.NavUtils;
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.os.Handler;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
 
+import java.net.URI;
 import java.util.List;
 import java.util.Vector;
 
+/**
+ * Created by Christian Schabesberger on 24.10.15.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * ErrorActivity.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 public class ErrorActivity extends AppCompatActivity {
 
     public static class ErrorInfo {
@@ -44,6 +74,8 @@ public class ErrorActivity extends AppCompatActivity {
     public static final int REQUESTED_STREAM = 1;
     public static final String SEARCHED_STRING = "Searched";
     public static final String REQUESTED_STREAM_STRING = "Requested Stream";
+    public static final String ERROR_EMAIL_ADDRESS = "dummy@dummy.org";
+    public static final String ERROR_EMAIL_SUBJECT="Exception in NewPipe " + BuildConfig.VERSION_NAME;
 
     private List<Exception> errorList;
     private ErrorInfo errorInfo;
@@ -51,6 +83,7 @@ public class ErrorActivity extends AppCompatActivity {
 
     // views
     private TextView errorView;
+    private EditText userCommentBox;
 
     public static void reportError(final Context context, final List<Exception> el,
                                    final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
@@ -113,6 +146,8 @@ public class ErrorActivity extends AppCompatActivity {
         returnActivity = ac.returnActivity;
         errorInfo = ac.errorInfo;
 
+        Button reportButton = (Button) findViewById(R.id.errorReportButton);
+        userCommentBox = (EditText) findViewById(R.id.errorCommentBox);
         errorView = (TextView) findViewById(R.id.errorView);
 
         errorView.setText(formErrorText(errorList));
@@ -120,14 +155,43 @@ public class ErrorActivity extends AppCompatActivity {
         //importand add gurumeditaion
         addGuruMeditaion();
         buildInfo(errorInfo);
+
+        reportButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+                Intent intent = new Intent(Intent.ACTION_SENDTO);
+                intent.setData(Uri.parse("mailto:" + ERROR_EMAIL_ADDRESS))
+                        .putExtra(Intent.EXTRA_SUBJECT, ERROR_EMAIL_SUBJECT)
+                        .putExtra(Intent.EXTRA_TEXT, buildJson());
+
+                startActivity(Intent.createChooser(intent, "Send Email"));
+            }
+        });
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        MenuInflater inflater = getMenuInflater();
+        inflater.inflate(R.menu.error_menu, menu);
+        return true;
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
-        if (id == android.R.id.home) {
-            goToReturnActivity();
-            return true;
+        switch(id) {
+            case android.R.id.home:
+                goToReturnActivity();
+                break;
+            case R.id.menu_item_share_error: {
+                Intent intent = new Intent();
+                intent.setAction(Intent.ACTION_SEND);
+                intent.putExtra(Intent.EXTRA_TEXT, buildJson());
+                intent.setType("text/plain");
+                startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
+            }
+                break;
         }
         return false;
     }
@@ -165,35 +229,65 @@ public class ErrorActivity extends AppCompatActivity {
 
         infoLabelView.setText(getString(R.string.info_labels).replace("\\n", "\n"));
 
-        String whatString = "";
-        switch (info.userAction) {
-            case REQUESTED_STREAM:
-                whatString = REQUESTED_STREAM_STRING;
-                break;
-            case SEARCHED:
-                whatString = SEARCHED_STRING;
-                break;
-            default:
-                whatString = "Your description is in another castle.";
-        }
-
-        String contentLang = PreferenceManager.getDefaultSharedPreferences(this)
-                .getString(this.getString(R.string.search_language_key), "none");
-
-        String osBase = Build.VERSION.SDK_INT >= 23 ? Build.VERSION.BASE_OS : "Android";
-        String osString = (osBase.isEmpty() ? "Android" : osBase)
-                + " " + Build.VERSION.RELEASE;
-
-        text += whatString
+        text += getUserActionString(info.userAction)
                 + "\n" + info.request
-                + "\n" + contentLang
+                + "\n" + getContentLangString()
                 + "\n" + info.serviceName
                 + "\n" + BuildConfig.VERSION_NAME
-                + "\n" + osString;
+                + "\n" + getOsString();
 
         infoView.setText(text);
     }
 
+    private String buildJson() {
+        JSONObject errorObject = new JSONObject();
+
+        try {
+            errorObject.put("user_action", getUserActionString(errorInfo.userAction))
+                    .put("request", errorInfo.request)
+                    .put("content_language", getContentLangString())
+                    .put("service", errorInfo.serviceName)
+                    .put("version", BuildConfig.VERSION_NAME)
+                    .put("os", getOsString());
+
+            JSONArray exceptionArray = new JSONArray();
+            for(Exception e : errorList) {
+                exceptionArray.put(ExceptionUtils.getStackTrace(e));
+            }
+
+            errorObject.put("exceptions", exceptionArray);
+            errorObject.put("user_comment", userCommentBox.getText().toString());
+
+            return errorObject.toString(3);
+        } catch (Exception e) {
+            Log.e(TAG, "Error while erroring: Could not build json");
+            e.printStackTrace();
+        }
+
+        return "";
+    }
+
+    private String getUserActionString(int userAction) {
+        switch (userAction) {
+            case REQUESTED_STREAM: return REQUESTED_STREAM_STRING;
+            case SEARCHED: return SEARCHED_STRING;
+            default: return "Your description is in another castle.";
+        }
+    }
+
+    private String getContentLangString() {
+        return PreferenceManager.getDefaultSharedPreferences(this)
+                .getString(this.getString(R.string.search_language_key), "none");
+    }
+
+    private String getOsString() {
+        String osBase = Build.VERSION.SDK_INT >= 23 ? Build.VERSION.BASE_OS : "Android";
+        return  System.getProperty("os.name")
+                + " " + (osBase.isEmpty() ? "Android" : osBase)
+                + " " + Build.VERSION.RELEASE
+                + " - " + Integer.toString(Build.VERSION.SDK_INT);
+    }
+
     private void addGuruMeditaion() {
         //just an easter egg
         TextView sorryView = (TextView) findViewById(R.id.errorSorryView);
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index 0bac36948..5c016f31f 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -330,8 +330,6 @@ public class YoutubeStreamExtractor implements StreamExtractor {
 
     @Override
     public String getUploader() throws ParsingException {
-        throw new ParsingException("blabla");
-        /*
         try {
             if (playerArgs == null) {
                 return videoInfoPage.get("author");
@@ -347,7 +345,6 @@ public class YoutubeStreamExtractor implements StreamExtractor {
         } catch (Exception e) {
             throw new ParsingException("failed permanently to load uploader name.", e);
         }
-        */
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 0b6fedb5a..68f61eeb3 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -46,15 +46,14 @@
                 
                 <TextView
                     android:id="@+id/errorInfoLabelsView"
-                    android:layout_weight="1"
-                    android:layout_width="200dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@android:color/black"
                     android:text="@string/info_labels"/>
 
                 <HorizontalScrollView
-                    android:layout_weight="1"
-                    android:layout_width="wrap_content"
+                    android:paddingLeft="16dp"
+                    android:layout_width="fill_parent"
                     android:layout_height="wrap_content">
 
                     <TextView
@@ -86,6 +85,19 @@
                     android:typeface="monospace"/>
             </HorizontalScrollView>
 
+            <TextView
+                android:id="@+id/errorYourComment"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/your_comment"/>
+
+            <EditText
+                android:id="@+id/errorCommentBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
             <Button
                 android:id="@+id/errorReportButton"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/menu/error_menu.xml b/app/src/main/res/menu/error_menu.xml
new file mode 100644
index 000000000..1af81f9fd
--- /dev/null
+++ b/app/src/main/res/menu/error_menu.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item android:id="@+id/menu_item_share_error"
+        android:title="@string/share"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_share_black"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4057b0ac8..bfbe9ca37 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,7 @@
     <string name="info_labels">What:\\nRequest:\\nContent Lang:\\nService:\\nVersion:\\nOS version:</string>
     <string name="info_searched_lbl">Searched for:</string>
     <string name="info_requested_stream_lbl">Requested stream:</string>
-    <string name="your_commend">Your commend:</string>
+    <string name="your_comment">Your comment (in English):</string>
 
 
     <!-- Content descriptions (for better accessibility) -->

From bc468b6f36adcf3c3449d44af7a852d1998a917b Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Fri, 26 Feb 2016 01:32:44 +0100
Subject: [PATCH 05/22] fixed stream exception handling

---
 .../newpipe/VideoItemDetailFragment.java       | 18 ++++++++++++++++++
 .../schabi/newpipe/extractor/VideoInfo.java    |  9 ++++++++-
 app/src/main/res/values/strings.xml            |  1 +
 3 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 05271e798..a023d36a7 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -165,6 +165,24 @@ public class VideoItemDetailFragment extends Fragment {
                     }
                 });
                 e.printStackTrace();
+            } catch(VideoInfo.StreamExctractException e) {
+                if(!videoInfo.errors.isEmpty()) {
+                    // !!! if this case ever kicks in someone gets kicked out !!!
+                    ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                } else {
+                    ErrorActivity.reportError(h, getActivity(), videoInfo.errors, VideoItemListActivity.class, null,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
+                }
+                h.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        getActivity().finish();
+                    }
+                });
+                e.printStackTrace();
             } catch (ParsingException e) {
                 ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
                         ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
index 2ae58a9f2..d023cf360 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
@@ -28,6 +28,12 @@ import java.util.Vector;
 @SuppressWarnings("ALL")
 public class VideoInfo extends AbstractVideoInfo {
 
+    public static class StreamExctractException extends ExtractionException {
+        StreamExctractException(String message) {
+            super(message);
+        }
+    }
+
     /**Fills out the video info fields which are common to all services.
      * Probably needs to be overridden by subclasses*/
     public static VideoInfo getVideoInfo(StreamExtractor extractor, Downloader downloader)
@@ -116,7 +122,8 @@ public class VideoInfo extends AbstractVideoInfo {
         if((videoInfo.video_streams == null || videoInfo.video_streams.isEmpty())
                 && (videoInfo.audio_streams == null || videoInfo.audio_streams.isEmpty())
                 && (videoInfo.dashMpdUrl == null || videoInfo.dashMpdUrl.isEmpty())) {
-            throw new ExtractionException("Could not get any stream. See error variable to get further details.");
+            throw new StreamExctractException(
+                    "Could not get any stream. See error variable to get further details.");
         }
 
         return videoInfo;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bfbe9ca37..0edc9e353 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,6 +88,7 @@
     <string name="blocked_by_gema">Blocked by GEMA.</string>
     <string name="could_not_setup_download_menu">Could not setup download menu.</string>
     <string name="live_streams_not_supported">This is a LIVE STREAM. These are not yet supported.</string>
+    <string name="could_not_get_stream">Could not get any stream.</string>
     <!-- error activity -->
     <string name="sorry_string">Sorry that should not happen.</string>
     <string name="guru_meditation" translatable="false">Guru Meditation.</string>

From 863e2a80a277a7c65e34e5bc2f9594ffd6a85547 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sat, 27 Feb 2016 02:26:06 +0100
Subject: [PATCH 06/22] set errors mail address

---
 app/src/main/java/org/schabi/newpipe/ErrorActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index a0875c773..c6fc5babe 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -74,7 +74,7 @@ public class ErrorActivity extends AppCompatActivity {
     public static final int REQUESTED_STREAM = 1;
     public static final String SEARCHED_STRING = "Searched";
     public static final String REQUESTED_STREAM_STRING = "Requested Stream";
-    public static final String ERROR_EMAIL_ADDRESS = "dummy@dummy.org";
+    public static final String ERROR_EMAIL_ADDRESS = "error@newpipe.schabi.org";
     public static final String ERROR_EMAIL_SUBJECT="Exception in NewPipe " + BuildConfig.VERSION_NAME;
 
     private List<Exception> errorList;

From 2d51c7428e8c672d90260b83ddb2782ae013deef Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sat, 27 Feb 2016 15:02:28 +0100
Subject: [PATCH 07/22] add ip and timestamp

---
 .../org/schabi/newpipe/ErrorActivity.java     | 102 ++++++++++++++----
 .../youtube/YoutubeStreamExtractor.java       |   2 +-
 app/src/main/res/values/strings.xml           |   2 +-
 3 files changed, 84 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index c6fc5babe..631d25ae1 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -5,8 +5,8 @@ package org.schabi.newpipe;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.net.MailTo;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.support.design.widget.Snackbar;
@@ -26,33 +26,35 @@ import android.widget.TextView;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.schabi.newpipe.extractor.Parser;
 
-import java.net.URI;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
 import java.util.Vector;
 
 /**
  * Created by Christian Schabesberger on 24.10.15.
- *
+ * <p>
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
  * ErrorActivity.java is part of NewPipe.
- *
+ * <p>
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
+ * <p>
  * NewPipe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- *
+ * <p>
  * You should have received a copy of the GNU General Public License
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 public class ErrorActivity extends AppCompatActivity {
-
     public static class ErrorInfo {
         public int userAction;
         public String request;
@@ -75,19 +77,24 @@ public class ErrorActivity extends AppCompatActivity {
     public static final String SEARCHED_STRING = "Searched";
     public static final String REQUESTED_STREAM_STRING = "Requested Stream";
     public static final String ERROR_EMAIL_ADDRESS = "error@newpipe.schabi.org";
-    public static final String ERROR_EMAIL_SUBJECT="Exception in NewPipe " + BuildConfig.VERSION_NAME;
+    public static final String ERROR_EMAIL_SUBJECT = "Exception in NewPipe " + BuildConfig.VERSION_NAME;
 
     private List<Exception> errorList;
     private ErrorInfo errorInfo;
     private Class returnActivity;
+    private String currentTimeStamp;
+    private String globIpRange;
+    Thread globIpRangeThread = null;
 
     // views
     private TextView errorView;
     private EditText userCommentBox;
+    private Button reportButton;
+    private TextView infoView;
 
     public static void reportError(final Context context, final List<Exception> el,
                                    final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
-        if(rootView != null) {
+        if (rootView != null) {
             Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
                     .setAction(R.string.error_snackbar_action, new View.OnClickListener() {
                         @Override
@@ -146,14 +153,16 @@ public class ErrorActivity extends AppCompatActivity {
         returnActivity = ac.returnActivity;
         errorInfo = ac.errorInfo;
 
-        Button reportButton = (Button) findViewById(R.id.errorReportButton);
+        reportButton = (Button) findViewById(R.id.errorReportButton);
         userCommentBox = (EditText) findViewById(R.id.errorCommentBox);
         errorView = (TextView) findViewById(R.id.errorView);
+        infoView = (TextView) findViewById(R.id.errorInfosView);
 
         errorView.setText(formErrorText(errorList));
 
         //importand add gurumeditaion
         addGuruMeditaion();
+        currentTimeStamp = getCurrentTimeStamp();
         buildInfo(errorInfo);
 
         reportButton.setOnClickListener(new View.OnClickListener() {
@@ -168,6 +177,10 @@ public class ErrorActivity extends AppCompatActivity {
                 startActivity(Intent.createChooser(intent, "Send Email"));
             }
         });
+        reportButton.setEnabled(false);
+
+        globIpRangeThread = new Thread(new IpRagneRequester());
+        globIpRangeThread.start();
     }
 
     @Override
@@ -180,7 +193,7 @@ public class ErrorActivity extends AppCompatActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
-        switch(id) {
+        switch (id) {
             case android.R.id.home:
                 goToReturnActivity();
                 break;
@@ -191,14 +204,14 @@ public class ErrorActivity extends AppCompatActivity {
                 intent.setType("text/plain");
                 startActivity(Intent.createChooser(intent, getString(R.string.share_dialog_title)));
             }
-                break;
+            break;
         }
         return false;
     }
 
     private String formErrorText(List<Exception> el) {
         String text = "";
-        for(Exception e : el) {
+        for (Exception e : el) {
             text += "-------------------------------------\n"
                     + ExceptionUtils.getStackTrace(e);
         }
@@ -207,7 +220,7 @@ public class ErrorActivity extends AppCompatActivity {
     }
 
     private void goToReturnActivity() {
-        if(returnActivity == null) {
+        if (returnActivity == null) {
             super.onBackPressed();
         } else {
             Intent intent;
@@ -233,6 +246,7 @@ public class ErrorActivity extends AppCompatActivity {
                 + "\n" + info.request
                 + "\n" + getContentLangString()
                 + "\n" + info.serviceName
+                + "\n" + currentTimeStamp
                 + "\n" + BuildConfig.VERSION_NAME
                 + "\n" + getOsString();
 
@@ -248,10 +262,12 @@ public class ErrorActivity extends AppCompatActivity {
                     .put("content_language", getContentLangString())
                     .put("service", errorInfo.serviceName)
                     .put("version", BuildConfig.VERSION_NAME)
-                    .put("os", getOsString());
+                    .put("os", getOsString())
+                    .put("time", currentTimeStamp)
+                    .put("ip_range", globIpRange);
 
             JSONArray exceptionArray = new JSONArray();
-            for(Exception e : errorList) {
+            for (Exception e : errorList) {
                 exceptionArray.put(ExceptionUtils.getStackTrace(e));
             }
 
@@ -269,9 +285,12 @@ public class ErrorActivity extends AppCompatActivity {
 
     private String getUserActionString(int userAction) {
         switch (userAction) {
-            case REQUESTED_STREAM: return REQUESTED_STREAM_STRING;
-            case SEARCHED: return SEARCHED_STRING;
-            default: return "Your description is in another castle.";
+            case REQUESTED_STREAM:
+                return REQUESTED_STREAM_STRING;
+            case SEARCHED:
+                return SEARCHED_STRING;
+            default:
+                return "Your description is in another castle.";
         }
     }
 
@@ -282,7 +301,7 @@ public class ErrorActivity extends AppCompatActivity {
 
     private String getOsString() {
         String osBase = Build.VERSION.SDK_INT >= 23 ? Build.VERSION.BASE_OS : "Android";
-        return  System.getProperty("os.name")
+        return System.getProperty("os.name")
                 + " " + (osBase.isEmpty() ? "Android" : osBase)
                 + " " + Build.VERSION.RELEASE
                 + " - " + Integer.toString(Build.VERSION.SDK_INT);
@@ -301,4 +320,47 @@ public class ErrorActivity extends AppCompatActivity {
         //super.onBackPressed();
         goToReturnActivity();
     }
+
+    public String getCurrentTimeStamp() {
+        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+        df.setTimeZone(TimeZone.getTimeZone("GMT"));
+        return df.format(new Date());
+    }
+
+    private class IpRagneRequester implements Runnable {
+        Handler h = new Handler();
+        public void run() {
+            String ipRange = "none";
+            try {
+                Downloader dl = new Downloader();
+                String ip = dl.download("https://ifcfg.me/ip");
+
+                ipRange = Parser.matchGroup1("([0-9]*\\.[0-9]*\\.)[0-9]*\\.[0-9]*", ip)
+                        + "0.0";
+            } catch(Exception e) {
+                Log.d(TAG, "Error while error: could not get iprange");
+                e.printStackTrace();
+            } finally {
+                h.post(new IpRageReturnRunnable(ipRange));
+            }
+        }
+    }
+
+
+
+    private class IpRageReturnRunnable implements Runnable {
+        String ipRange;
+        public IpRageReturnRunnable(String ipRange) {
+            this.ipRange = ipRange;
+        }
+        public void run() {
+            globIpRange = ipRange;
+            if(infoView != null) {
+                String text = infoView.getText().toString();
+                text += "\n" + globIpRange;
+                infoView.setText(text);
+                reportButton.setEnabled(true);
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index 5c016f31f..758fb86f6 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -412,6 +412,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
 
     @Override
     public String getDashMpdUrl() throws ParsingException {
+        throw new ParsingException("blabla");
         /*
         try {
             String dashManifestUrl = videoInfoPage.get("dashmpd");
@@ -428,7 +429,6 @@ public class YoutubeStreamExtractor implements StreamExtractor {
                     "Could not get \"dashmpd\" maybe VideoInfoPage is broken.", e);
         }
         */
-        return "";
     }
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0edc9e353..95ed0e1a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -97,7 +97,7 @@
     <string name="error_snackbar_action">REPORT</string>
     <string name="what_device_headline">Info:</string>
     <string name="what_happened_headline">What happened:</string>
-    <string name="info_labels">What:\\nRequest:\\nContent Lang:\\nService:\\nVersion:\\nOS version:</string>
+    <string name="info_labels">What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nVersion:\\nOS version:\\nGlob. IP range:</string>
     <string name="info_searched_lbl">Searched for:</string>
     <string name="info_requested_stream_lbl">Requested stream:</string>
     <string name="your_comment">Your comment (in English):</string>

From b1fe197c1125b0cd6d6a2e4401bf560de3498f59 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sat, 27 Feb 2016 15:57:37 +0100
Subject: [PATCH 08/22] changed crashreport email address

---
 app/src/main/java/org/schabi/newpipe/ErrorActivity.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index 631d25ae1..594026f7a 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -76,7 +76,7 @@ public class ErrorActivity extends AppCompatActivity {
     public static final int REQUESTED_STREAM = 1;
     public static final String SEARCHED_STRING = "Searched";
     public static final String REQUESTED_STREAM_STRING = "Requested Stream";
-    public static final String ERROR_EMAIL_ADDRESS = "error@newpipe.schabi.org";
+    public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
     public static final String ERROR_EMAIL_SUBJECT = "Exception in NewPipe " + BuildConfig.VERSION_NAME;
 
     private List<Exception> errorList;

From 045ca40a7790f45d8edc908d8e95a083fe7b10aa Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sat, 27 Feb 2016 16:37:15 +0100
Subject: [PATCH 09/22] renamed video classes to stream classes

---
 .../youtube/YoutubeSearchEngineTest.java      |  16 +-
 .../YoutubeStreamExtractorDefaultTest.java    |   4 +-
 .../YoutubeStreamExtractorRestrictedTest.java |   4 +-
 .../org/schabi/newpipe/ActionBarHandler.java  |  10 +-
 .../newpipe/VideoInfoItemViewCreator.java     |   5 +-
 .../newpipe/VideoItemDetailFragment.java      |  66 ++++----
 .../schabi/newpipe/VideoItemListFragment.java |   6 +-
 .../org/schabi/newpipe/VideoListAdapter.java  |   8 +-
 .../newpipe/extractor/AbstractVideoInfo.java  |   2 +-
 .../newpipe/extractor/DashMpdParser.java      |   6 +-
 .../newpipe/extractor/SearchEngine.java       |   2 +-
 .../newpipe/extractor/StreamExtractor.java    |  14 +-
 .../{VideoInfo.java => StreamInfo.java}       | 160 +++++++++---------
 ...reviewInfo.java => StreamPreviewInfo.java} |   6 +-
 ...IdHandler.java => StreamUrlIdHandler.java} |   4 +-
 .../newpipe/extractor/StreamingService.java   |   4 +-
 .../services/youtube/YoutubeSearchEngine.java |   8 +-
 .../services/youtube/YoutubeService.java      |   8 +-
 .../youtube/YoutubeStreamExtractor.java       |  40 ++---
 ...er.java => YoutubeStreamUrlIdHandler.java} |   6 +-
 20 files changed, 190 insertions(+), 189 deletions(-)
 rename app/src/main/java/org/schabi/newpipe/extractor/{VideoInfo.java => StreamInfo.java} (61%)
 rename app/src/main/java/org/schabi/newpipe/extractor/{VideoPreviewInfo.java => StreamPreviewInfo.java} (84%)
 rename app/src/main/java/org/schabi/newpipe/extractor/{VideoUrlIdHandler.java => StreamUrlIdHandler.java} (93%)
 rename app/src/main/java/org/schabi/newpipe/extractor/services/youtube/{YoutubeVideoUrlIdHandler.java => YoutubeStreamUrlIdHandler.java} (93%)

diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
index ed6d17aae..6c3540754 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
@@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.youtube;
 
 import android.test.AndroidTestCase;
 
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
 import org.schabi.newpipe.extractor.SearchEngine;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeSearchEngine;
 import org.schabi.newpipe.Downloader;
@@ -52,44 +52,44 @@ public class YoutubeSearchEngineTest extends AndroidTestCase {
     }
 
     public void testItemsHaveTitle() {
-        for(VideoPreviewInfo i : result.resultList) {
+        for(StreamPreviewInfo i : result.resultList) {
             assertEquals(i.title.isEmpty(), false);
         }
     }
 
     public void testItemsHaveUploader() {
-        for(VideoPreviewInfo i : result.resultList) {
+        for(StreamPreviewInfo i : result.resultList) {
             assertEquals(i.uploader.isEmpty(), false);
         }
     }
 
     public void testItemsHaveRightDuration() {
-        for(VideoPreviewInfo i : result.resultList) {
+        for(StreamPreviewInfo i : result.resultList) {
             assertTrue(i.duration, i.duration.contains(":"));
         }
     }
 
     public void testItemsHaveRightThumbnail() {
-        for (VideoPreviewInfo i : result.resultList) {
+        for (StreamPreviewInfo i : result.resultList) {
             assertTrue(i.thumbnail_url, i.thumbnail_url.contains("https://"));
         }
     }
 
     public void testItemsHaveRightVideoUrl() {
-        for (VideoPreviewInfo i : result.resultList) {
+        for (StreamPreviewInfo i : result.resultList) {
             assertTrue(i.webpage_url, i.webpage_url.contains("https://"));
         }
     }
 
     public void testViewCount() {
         /*
-        for(VideoPreviewInfo i : result.resultList) {
+        for(StreamPreviewInfo i : result.resultList) {
             assertTrue(Long.toString(i.view_count), i.view_count != -1);
         }
         */
         // that specific link used for this test, there are no videos with less
         // than 10.000 views, so we can test against that.
-        for(VideoPreviewInfo i : result.resultList) {
+        for(StreamPreviewInfo i : result.resultList) {
             assertTrue(Long.toString(i.view_count), i.view_count >= 10000);
         }
     }
diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java
index 4f4c529e5..e35fd86d8 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorDefaultTest.java
@@ -6,7 +6,7 @@ import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
-import org.schabi.newpipe.extractor.VideoInfo;
+import org.schabi.newpipe.extractor.StreamInfo;
 
 import java.io.IOException;
 
@@ -94,7 +94,7 @@ public class YoutubeStreamExtractorDefaultTest extends AndroidTestCase {
     }
 
     public void testGetVideoStreams() throws ParsingException {
-        for(VideoInfo.VideoStream s : extractor.getVideoStreams()) {
+        for(StreamInfo.VideoStream s : extractor.getVideoStreams()) {
             assertTrue(s.url,
                     s.url.contains("https://"));
             assertTrue(s.resolution.length() > 0);
diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java
index c00a91ac8..12d8a65c7 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeStreamExtractorRestrictedTest.java
@@ -5,7 +5,7 @@ import android.test.AndroidTestCase;
 import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.VideoInfo;
+import org.schabi.newpipe.extractor.StreamInfo;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
 
 import java.io.IOException;
@@ -73,7 +73,7 @@ public class YoutubeStreamExtractorRestrictedTest extends AndroidTestCase {
     }
 
     public void testGetVideoStreams() throws ParsingException {
-        for(VideoInfo.VideoStream s : extractor.getVideoStreams()) {
+        for(StreamInfo.VideoStream s : extractor.getVideoStreams()) {
             assertTrue(s.url,
                     s.url.contains("https://"));
             assertTrue(s.resolution.length() > 0);
diff --git a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
index 5123f494b..6836f223e 100644
--- a/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/ActionBarHandler.java
@@ -12,7 +12,7 @@ import android.view.MenuItem;
 import android.widget.ArrayAdapter;
 
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.VideoInfo;
+import org.schabi.newpipe.extractor.StreamInfo;
 
 import java.util.List;
 
@@ -75,7 +75,7 @@ class ActionBarHandler {
         }
     }
 
-    public void setupStreamList(final List<VideoInfo.VideoStream> videoStreams) {
+    public void setupStreamList(final List<StreamInfo.VideoStream> videoStreams) {
         if (activity != null) {
             selectedVideoStream = 0;
 
@@ -83,7 +83,7 @@ class ActionBarHandler {
             // this array will be shown in the dropdown menu for selecting the stream/resolution.
             String[] itemArray = new String[videoStreams.size()];
             for (int i = 0; i < videoStreams.size(); i++) {
-                VideoInfo.VideoStream item = videoStreams.get(i);
+                StreamInfo.VideoStream item = videoStreams.get(i);
                 itemArray[i] = MediaFormat.getNameById(item.format) + " " + item.resolution;
             }
             int defaultResolution = getDefaultResolution(videoStreams);
@@ -108,13 +108,13 @@ class ActionBarHandler {
     }
 
 
-    private int getDefaultResolution(final List<VideoInfo.VideoStream> videoStreams) {
+    private int getDefaultResolution(final List<StreamInfo.VideoStream> videoStreams) {
         String defaultResolution = defaultPreferences
                 .getString(activity.getString(R.string.default_resolution_key),
                         activity.getString(R.string.default_resolution_value));
 
         for (int i = 0; i < videoStreams.size(); i++) {
-            VideoInfo.VideoStream item = videoStreams.get(i);
+            StreamInfo.VideoStream item = videoStreams.get(i);
             if (defaultResolution.equals(item.resolution)) {
                 return i;
             }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
index 0cf8645d0..0c909e325 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -7,7 +7,8 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
+
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
@@ -40,7 +41,7 @@ class VideoInfoItemViewCreator {
         this.inflater = inflater;
     }
 
-    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, VideoPreviewInfo info, Context context) {
+    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, StreamPreviewInfo info, Context context) {
         ViewHolder holder;
         if(convertView == null) {
             convertView = inflater.inflate(R.layout.video_item, parent, false);
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index a023d36a7..50e0aeaba 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -50,9 +50,9 @@ import org.schabi.newpipe.extractor.MediaFormat;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.ServiceList;
 import org.schabi.newpipe.extractor.StreamExtractor;
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.VideoInfo;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamExtractor;
 
 
@@ -127,12 +127,12 @@ public class VideoItemDetailFragment extends Fragment {
 
         @Override
         public void run() {
-            VideoInfo videoInfo = null;
+            StreamInfo streamInfo = null;
             try {
                 streamExtractor = service.getExtractorInstance(videoUrl, new Downloader());
-                videoInfo = VideoInfo.getVideoInfo(streamExtractor, new Downloader());
+                streamInfo = StreamInfo.getVideoInfo(streamExtractor, new Downloader());
 
-                h.post(new VideoResultReturnedRunnable(videoInfo));
+                h.post(new VideoResultReturnedRunnable(streamInfo));
             } catch (IOException e) {
                 postNewErrorToast(h, R.string.network_error);
                 e.printStackTrace();
@@ -165,14 +165,14 @@ public class VideoItemDetailFragment extends Fragment {
                     }
                 });
                 e.printStackTrace();
-            } catch(VideoInfo.StreamExctractException e) {
-                if(!videoInfo.errors.isEmpty()) {
+            } catch(StreamInfo.StreamExctractException e) {
+                if(!streamInfo.errors.isEmpty()) {
                     // !!! if this case ever kicks in someone gets kicked out !!!
                     ErrorActivity.reportError(h, getActivity(), e, VideoItemListActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
                                     service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
                 } else {
-                    ErrorActivity.reportError(h, getActivity(), videoInfo.errors, VideoItemListActivity.class, null,
+                    ErrorActivity.reportError(h, getActivity(), streamInfo.errors, VideoItemListActivity.class, null,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
                                     service.getServiceInfo().name, videoUrl, R.string.could_not_get_stream));
                 }
@@ -206,17 +206,17 @@ public class VideoItemDetailFragment extends Fragment {
                         });
                 e.printStackTrace();
             } finally {
-                if(videoInfo != null &&
-                        !videoInfo.errors.isEmpty()) {
+                if(streamInfo != null &&
+                        !streamInfo.errors.isEmpty()) {
                     Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
-                    for(Exception e : videoInfo.errors) {
+                    for(Exception e : streamInfo.errors) {
                         e.printStackTrace();
                     }
 
                     Activity a = getActivity();
                     View rootView = a != null ? a.findViewById(R.id.videoitem_detail) : null;
                     ErrorActivity.reportError(h, getActivity(),
-                            videoInfo.errors, null, rootView,
+                            streamInfo.errors, null, rootView,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
                                     service.getServiceInfo().name,  videoUrl, 0 /* no message for the user */));
                 }
@@ -225,16 +225,16 @@ public class VideoItemDetailFragment extends Fragment {
     }
 
     private class VideoResultReturnedRunnable implements Runnable {
-        private final VideoInfo videoInfo;
-        public VideoResultReturnedRunnable(VideoInfo videoInfo) {
-            this.videoInfo = videoInfo;
+        private final StreamInfo streamInfo;
+        public VideoResultReturnedRunnable(StreamInfo streamInfo) {
+            this.streamInfo = streamInfo;
         }
         @Override
         public void run() {
             boolean show_age_restricted_content = PreferenceManager.getDefaultSharedPreferences(getActivity())
                     .getBoolean(activity.getString(R.string.show_age_restricted_content), false);
-            if(videoInfo.age_limit == 0 || show_age_restricted_content) {
-                updateInfo(videoInfo);
+            if(streamInfo.age_limit == 0 || show_age_restricted_content) {
+                updateInfo(streamInfo);
             } else {
                 onNotSpecifiedContentErrorWithMessage(R.string.video_is_age_restricted);
             }
@@ -261,7 +261,7 @@ public class VideoItemDetailFragment extends Fragment {
         public void onLoadingCancelled(String imageUri, View view) {}
     }
 
-    private void updateInfo(final VideoInfo info) {
+    private void updateInfo(final StreamInfo info) {
         try {
             Context c = getContext();
             VideoInfoItemViewCreator videoItemViewCreator =
@@ -378,8 +378,8 @@ public class VideoItemDetailFragment extends Fragment {
             descriptionView.setMovementMethod(LinkMovementMethod.getInstance());
 
             // parse streams
-            Vector<VideoInfo.VideoStream> streamsToUse = new Vector<>();
-            for (VideoInfo.VideoStream i : info.video_streams) {
+            Vector<StreamInfo.VideoStream> streamsToUse = new Vector<>();
+            for (StreamInfo.VideoStream i : info.video_streams) {
                 if (useStream(i, streamsToUse)) {
                     streamsToUse.add(i);
                 }
@@ -435,7 +435,7 @@ public class VideoItemDetailFragment extends Fragment {
         }
     }
 
-    private void initThumbnailViews(VideoInfo info, View nextVideoFrame) {
+    private void initThumbnailViews(StreamInfo info, View nextVideoFrame) {
         ImageView videoThumbnailView = (ImageView) activity.findViewById(R.id.detailThumbnailView);
         ImageView uploaderThumb
                 = (ImageView) activity.findViewById(R.id.detailUploaderThumbnailView);
@@ -478,7 +478,7 @@ public class VideoItemDetailFragment extends Fragment {
         }
     }
 
-    private void setupActionBarHandler(final VideoInfo info) {
+    private void setupActionBarHandler(final StreamInfo info) {
         actionBarHandler.setupStreamList(info.video_streams);
 
         actionBarHandler.setOnShareListener(new ActionBarHandler.OnActionListener() {
@@ -545,7 +545,7 @@ public class VideoItemDetailFragment extends Fragment {
                     // website which was crawled. Then the ui has to understand this and act right.
 
                     if (info.audio_streams != null) {
-                        VideoInfo.AudioStream audioStream =
+                        StreamInfo.AudioStream audioStream =
                                 info.audio_streams.get(getPreferredAudioStreamId(info));
 
                         String audioSuffix = "." + MediaFormat.getSuffixById(audioStream.format);
@@ -554,7 +554,7 @@ public class VideoItemDetailFragment extends Fragment {
                     }
 
                     if (info.video_streams != null) {
-                        VideoInfo.VideoStream selectedStreamItem = info.video_streams.get(selectedStreamId);
+                        StreamInfo.VideoStream selectedStreamItem = info.video_streams.get(selectedStreamId);
                         String videoSuffix = "." + MediaFormat.getSuffixById(selectedStreamItem.format);
                         args.putString(DownloadDialog.FILE_SUFFIX_VIDEO, videoSuffix);
                         args.putString(DownloadDialog.VIDEO_URL, selectedStreamItem.url);
@@ -581,7 +581,7 @@ public class VideoItemDetailFragment extends Fragment {
                     boolean useExternalAudioPlayer = PreferenceManager.getDefaultSharedPreferences(activity)
                             .getBoolean(activity.getString(R.string.use_external_audio_player_key), false);
                     Intent intent;
-                    VideoInfo.AudioStream audioStream =
+                    StreamInfo.AudioStream audioStream =
                             info.audio_streams.get(getPreferredAudioStreamId(info));
                     if (!useExternalAudioPlayer && android.os.Build.VERSION.SDK_INT >= 18) {
                         //internal music player: explicit intent
@@ -640,7 +640,7 @@ public class VideoItemDetailFragment extends Fragment {
         }
     }
 
-    private int getPreferredAudioStreamId(final VideoInfo info) {
+    private int getPreferredAudioStreamId(final StreamInfo info) {
         String preferredFormatString = PreferenceManager.getDefaultSharedPreferences(getActivity())
                 .getString(activity.getString(R.string.default_audio_format_key), "webm");
 
@@ -667,10 +667,10 @@ public class VideoItemDetailFragment extends Fragment {
         return 0;
     }
 
-    private void initSimilarVideos(final VideoInfo info, VideoInfoItemViewCreator videoItemViewCreator) {
+    private void initSimilarVideos(final StreamInfo info, VideoInfoItemViewCreator videoItemViewCreator) {
         LinearLayout similarLayout = (LinearLayout) activity.findViewById(R.id.similarVideosView);
-        ArrayList<VideoPreviewInfo> similar = new ArrayList<>(info.related_videos);
-        for (final VideoPreviewInfo item : similar) {
+        ArrayList<StreamPreviewInfo> similar = new ArrayList<>(info.related_videos);
+        for (final StreamPreviewInfo item : similar) {
             View similarView = videoItemViewCreator
                     .getViewFromVideoInfoItem(null, similarLayout, item, getContext());
 
@@ -744,8 +744,8 @@ public class VideoItemDetailFragment extends Fragment {
                 .show();
     }
 
-    private boolean useStream(VideoInfo.VideoStream stream, Vector<VideoInfo.VideoStream> streams) {
-        for(VideoInfo.VideoStream i : streams) {
+    private boolean useStream(StreamInfo.VideoStream stream, Vector<StreamInfo.VideoStream> streams) {
+        for(StreamInfo.VideoStream i : streams) {
             if(i.resolution.equals(stream.resolution)) {
                 return false;
             }
@@ -835,9 +835,9 @@ public class VideoItemDetailFragment extends Fragment {
         }
     }
 
-    public void playVideo(final VideoInfo info) {
+    public void playVideo(final StreamInfo info) {
         // ----------- THE MAGIC MOMENT ---------------
-        VideoInfo.VideoStream selectedVideoStream =
+        StreamInfo.VideoStream selectedVideoStream =
                 info.video_streams.get(actionBarHandler.getSelectedVideoStream());
 
         if (PreferenceManager.getDefaultSharedPreferences(activity)
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index 75f80f7ae..af659bfc4 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -17,7 +17,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.schabi.newpipe.extractor.ExtractionException;
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
 import org.schabi.newpipe.extractor.SearchEngine;
 import org.schabi.newpipe.extractor.StreamingService;
 
@@ -125,7 +125,7 @@ public class VideoItemListFragment extends ListFragment {
         }
     }
 
-    public void present(List<VideoPreviewInfo> videoList) {
+    public void present(List<StreamPreviewInfo> videoList) {
         mode = PRESENT_VIDEOS_MODE;
         setListShown(true);
         getListView().smoothScrollToPosition(0);
@@ -180,7 +180,7 @@ public class VideoItemListFragment extends ListFragment {
         }
     }
 
-    private void updateList(List<VideoPreviewInfo> list) {
+    private void updateList(List<StreamPreviewInfo> list) {
         try {
             videoListAdapter.addVideoList(list);
             terminateThreads();
diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
index 702e2cfdd..06dab38b4 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -8,7 +8,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
 
 import java.util.List;
 import java.util.Vector;
@@ -36,7 +36,7 @@ import java.util.Vector;
 class VideoListAdapter extends BaseAdapter {
     private final Context context;
     private final VideoInfoItemViewCreator viewCreator;
-    private Vector<VideoPreviewInfo> videoList = new Vector<>();
+    private Vector<StreamPreviewInfo> videoList = new Vector<>();
     private final ListView listView;
 
     public VideoListAdapter(Context context, VideoItemListFragment videoListFragment) {
@@ -47,7 +47,7 @@ class VideoListAdapter extends BaseAdapter {
         this.context = context;
     }
 
-    public void addVideoList(List<VideoPreviewInfo> videos) {
+    public void addVideoList(List<StreamPreviewInfo> videos) {
         videoList.addAll(videos);
         notifyDataSetChanged();
     }
@@ -57,7 +57,7 @@ class VideoListAdapter extends BaseAdapter {
         notifyDataSetChanged();
     }
 
-    public Vector<VideoPreviewInfo> getVideoList() {
+    public Vector<StreamPreviewInfo> getVideoList() {
         return videoList;
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/AbstractVideoInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/AbstractVideoInfo.java
index 1fe776e5e..79d43770b 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/AbstractVideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/AbstractVideoInfo.java
@@ -20,7 +20,7 @@ import android.graphics.Bitmap;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**Common properties between VideoInfo and VideoPreviewInfo.*/
+/**Common properties between StreamInfo and StreamPreviewInfo.*/
 public abstract class AbstractVideoInfo {
     public String id = "";
     public String title = "";
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java b/app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java
index 9dfbe8d14..55cae46fa 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/DashMpdParser.java
@@ -37,7 +37,7 @@ public class DashMpdParser {
         }
     }
 
-    public static List<VideoInfo.AudioStream> getAudioStreams(String dashManifestUrl,
+    public static List<StreamInfo.AudioStream> getAudioStreams(String dashManifestUrl,
                                                              Downloader downloader)
             throws DashMpdParsingException {
         String dashDoc;
@@ -46,7 +46,7 @@ public class DashMpdParser {
         } catch(IOException ioe) {
             throw new DashMpdParsingException("Could not get dash mpd: " + dashManifestUrl, ioe);
         }
-        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
+        Vector<StreamInfo.AudioStream> audioStreams = new Vector<>();
         try {
             XmlPullParser parser = Xml.newPullParser();
             parser.setInput(new StringReader(dashDoc));
@@ -83,7 +83,7 @@ public class DashMpdParser {
                             } else if(currentMimeType.equals(MediaFormat.M4A.mimeType)) {
                                 format = MediaFormat.M4A.id;
                             }
-                            audioStreams.add(new VideoInfo.AudioStream(parser.getText(),
+                            audioStreams.add(new StreamInfo.AudioStream(parser.getText(),
                                     format, currentBandwidth, currentSamplingRate));
                         }
                         break;
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
index 74f3f0f60..9b084b9d8 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
@@ -30,7 +30,7 @@ public interface SearchEngine {
     class Result {
         public String errorMessage = "";
         public String suggestion = "";
-        public final List<VideoPreviewInfo> resultList = new Vector<>();
+        public final List<StreamPreviewInfo> resultList = new Vector<>();
     }
 
     ArrayList<String> suggestionList(String query,String contentCountry, Downloader dl)
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
index 53bbe317e..4fb396e1f 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
@@ -3,7 +3,7 @@ package org.schabi.newpipe.extractor;
 /**
  * Created by Christian Schabesberger on 10.08.15.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
  * StreamExtractor.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
@@ -61,16 +61,16 @@ public interface StreamExtractor {
     public abstract String getUploadDate() throws ParsingException;
     public abstract String getThumbnailUrl() throws ParsingException;
     public abstract String getUploaderThumbnailUrl() throws ParsingException;
-    public abstract List<VideoInfo.AudioStream> getAudioStreams() throws ParsingException;
-    public abstract List<VideoInfo.VideoStream> getVideoStreams() throws ParsingException;
-    public abstract List<VideoInfo.VideoStream> getVideoOnlyStreams() throws ParsingException;
+    public abstract List<StreamInfo.AudioStream> getAudioStreams() throws ParsingException;
+    public abstract List<StreamInfo.VideoStream> getVideoStreams() throws ParsingException;
+    public abstract List<StreamInfo.VideoStream> getVideoOnlyStreams() throws ParsingException;
     public abstract String getDashMpdUrl() throws ParsingException;
     public abstract int getAgeLimit() throws ParsingException;
     public abstract String getAverageRating() throws ParsingException;
     public abstract int getLikeCount() throws ParsingException;
     public abstract int getDislikeCount() throws ParsingException;
-    public abstract VideoPreviewInfo getNextVideo() throws ParsingException;
-    public abstract List<VideoPreviewInfo> getRelatedVideos() throws ParsingException;
-    public abstract VideoUrlIdHandler getUrlIdConverter();
+    public abstract StreamPreviewInfo getNextVideo() throws ParsingException;
+    public abstract List<StreamPreviewInfo> getRelatedVideos() throws ParsingException;
+    public abstract StreamUrlIdHandler getUrlIdConverter();
     public abstract String getPageUrl();
 }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamInfo.java
similarity index 61%
rename from app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
rename to app/src/main/java/org/schabi/newpipe/extractor/StreamInfo.java
index d023cf360..b6da26404 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/VideoInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamInfo.java
@@ -7,8 +7,8 @@ import java.util.Vector;
 /**
  * Created by Christian Schabesberger on 26.08.15.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoInfo.java is part of NewPipe.
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamInfo.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ import java.util.Vector;
 
 /**Info object for opened videos, ie the video ready to play.*/
 @SuppressWarnings("ALL")
-public class VideoInfo extends AbstractVideoInfo {
+public class StreamInfo extends AbstractVideoInfo {
 
     public static class StreamExctractException extends ExtractionException {
         StreamExctractException(String message) {
@@ -36,178 +36,178 @@ public class VideoInfo extends AbstractVideoInfo {
 
     /**Fills out the video info fields which are common to all services.
      * Probably needs to be overridden by subclasses*/
-    public static VideoInfo getVideoInfo(StreamExtractor extractor, Downloader downloader)
+    public static StreamInfo getVideoInfo(StreamExtractor extractor, Downloader downloader)
             throws ExtractionException, IOException {
-        VideoInfo videoInfo = new VideoInfo();
+        StreamInfo streamInfo = new StreamInfo();
 
-        videoInfo = extractImportantData(videoInfo, extractor, downloader);
-        videoInfo = extractStreams(videoInfo, extractor, downloader);
-        videoInfo = extractOptionalData(videoInfo, extractor, downloader);
+        streamInfo = extractImportantData(streamInfo, extractor, downloader);
+        streamInfo = extractStreams(streamInfo, extractor, downloader);
+        streamInfo = extractOptionalData(streamInfo, extractor, downloader);
 
-        return videoInfo;
+        return streamInfo;
     }
 
-    private static VideoInfo extractImportantData(
-            VideoInfo videoInfo, StreamExtractor extractor, Downloader downloader)
+    private static StreamInfo extractImportantData(
+            StreamInfo streamInfo, StreamExtractor extractor, Downloader downloader)
             throws ExtractionException, IOException {
         /* ---- importand data, withoug the video can't be displayed goes here: ---- */
         // if one of these is not available an exception is ment to be thrown directly into the frontend.
 
-        VideoUrlIdHandler uiconv = extractor.getUrlIdConverter();
+        StreamUrlIdHandler uiconv = extractor.getUrlIdConverter();
 
-        videoInfo.webpage_url = extractor.getPageUrl();
-        videoInfo.id = uiconv.getVideoId(extractor.getPageUrl());
-        videoInfo.title = extractor.getTitle();
-        videoInfo.age_limit = extractor.getAgeLimit();
+        streamInfo.webpage_url = extractor.getPageUrl();
+        streamInfo.id = uiconv.getVideoId(extractor.getPageUrl());
+        streamInfo.title = extractor.getTitle();
+        streamInfo.age_limit = extractor.getAgeLimit();
 
-        if((videoInfo.webpage_url == null || videoInfo.webpage_url.isEmpty())
-                || (videoInfo.id == null || videoInfo.id.isEmpty())
-                || (videoInfo.title == null /* videoInfo.title can be empty of course */)
-                || (videoInfo.age_limit == -1));
+        if((streamInfo.webpage_url == null || streamInfo.webpage_url.isEmpty())
+                || (streamInfo.id == null || streamInfo.id.isEmpty())
+                || (streamInfo.title == null /* streamInfo.title can be empty of course */)
+                || (streamInfo.age_limit == -1));
 
-        return videoInfo;
+        return streamInfo;
     }
 
-    private static VideoInfo extractStreams(
-            VideoInfo videoInfo, StreamExtractor extractor, Downloader downloader)
+    private static StreamInfo extractStreams(
+            StreamInfo streamInfo, StreamExtractor extractor, Downloader downloader)
             throws ExtractionException, IOException {
         /* ---- stream extraction goes here ---- */
         // At least one type of stream has to be available,
         // otherwise an exception will be thrown directly into the frontend.
 
         try {
-            videoInfo.dashMpdUrl = extractor.getDashMpdUrl();
+            streamInfo.dashMpdUrl = extractor.getDashMpdUrl();
         } catch(Exception e) {
-            videoInfo.addException(new ExtractionException("Couldn't get Dash manifest", e));
+            streamInfo.addException(new ExtractionException("Couldn't get Dash manifest", e));
         }
 
         /*  Load and extract audio */
         try {
-            videoInfo.audio_streams = extractor.getAudioStreams();
+            streamInfo.audio_streams = extractor.getAudioStreams();
         } catch(Exception e) {
-            videoInfo.addException(new ExtractionException("Couldn't get audio streams", e));
+            streamInfo.addException(new ExtractionException("Couldn't get audio streams", e));
         }
         // also try to get streams from the dashMpd
-        if(videoInfo.dashMpdUrl != null && !videoInfo.dashMpdUrl.isEmpty()) {
-            if(videoInfo.audio_streams == null) {
-                videoInfo.audio_streams = new Vector<AudioStream>();
+        if(streamInfo.dashMpdUrl != null && !streamInfo.dashMpdUrl.isEmpty()) {
+            if(streamInfo.audio_streams == null) {
+                streamInfo.audio_streams = new Vector<AudioStream>();
             }
             //todo: make this quick and dirty solution a real fallback
             // same as the quick and dirty aboth
             try {
-                videoInfo.audio_streams.addAll(
-                        DashMpdParser.getAudioStreams(videoInfo.dashMpdUrl, downloader));
+                streamInfo.audio_streams.addAll(
+                        DashMpdParser.getAudioStreams(streamInfo.dashMpdUrl, downloader));
             } catch(Exception e) {
-                videoInfo.addException(
+                streamInfo.addException(
                         new ExtractionException("Couldn't get audio streams from dash mpd", e));
             }
         }
         /* Extract video stream url*/
         try {
-            videoInfo.video_streams = extractor.getVideoStreams();
+            streamInfo.video_streams = extractor.getVideoStreams();
         } catch (Exception e) {
-            videoInfo.addException(
+            streamInfo.addException(
                     new ExtractionException("Couldn't get video streams", e));
         }
         /* Extract video only stream url*/
         try {
-            videoInfo.video_only_streams = extractor.getVideoOnlyStreams();
+            streamInfo.video_only_streams = extractor.getVideoOnlyStreams();
         } catch(Exception e) {
-            videoInfo.addException(
+            streamInfo.addException(
                     new ExtractionException("Couldn't get video only streams", e));
         }
 
         // either dash_mpd audio_only or video has to be available, otherwise we didn't get a stream,
         // and therefore failed. (Since video_only_streams are just optional they don't caunt).
-        if((videoInfo.video_streams == null || videoInfo.video_streams.isEmpty())
-                && (videoInfo.audio_streams == null || videoInfo.audio_streams.isEmpty())
-                && (videoInfo.dashMpdUrl == null || videoInfo.dashMpdUrl.isEmpty())) {
+        if((streamInfo.video_streams == null || streamInfo.video_streams.isEmpty())
+                && (streamInfo.audio_streams == null || streamInfo.audio_streams.isEmpty())
+                && (streamInfo.dashMpdUrl == null || streamInfo.dashMpdUrl.isEmpty())) {
             throw new StreamExctractException(
                     "Could not get any stream. See error variable to get further details.");
         }
 
-        return videoInfo;
+        return streamInfo;
     }
 
-    private static VideoInfo extractOptionalData(
-            VideoInfo videoInfo, StreamExtractor extractor, Downloader downloader) {
+    private static StreamInfo extractOptionalData(
+            StreamInfo streamInfo, StreamExtractor extractor, Downloader downloader) {
         /*  ---- optional data goes here: ---- */
         // If one of these failes, the frontend neets to handle that they are not available.
         // Exceptions are therfore not thrown into the frontend, but stored into the error List,
         // so the frontend can afterwads check where errors happend.
 
         try {
-            videoInfo.thumbnail_url = extractor.getThumbnailUrl();
+            streamInfo.thumbnail_url = extractor.getThumbnailUrl();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.duration = extractor.getLength();
+            streamInfo.duration = extractor.getLength();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.uploader = extractor.getUploader();
+            streamInfo.uploader = extractor.getUploader();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.description = extractor.getDescription();
+            streamInfo.description = extractor.getDescription();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.view_count = extractor.getViewCount();
+            streamInfo.view_count = extractor.getViewCount();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.upload_date = extractor.getUploadDate();
+            streamInfo.upload_date = extractor.getUploadDate();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
+            streamInfo.uploader_thumbnail_url = extractor.getUploaderThumbnailUrl();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.start_position = extractor.getTimeStamp();
+            streamInfo.start_position = extractor.getTimeStamp();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.average_rating = extractor.getAverageRating();
+            streamInfo.average_rating = extractor.getAverageRating();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.like_count = extractor.getLikeCount();
+            streamInfo.like_count = extractor.getLikeCount();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.dislike_count = extractor.getDislikeCount();
+            streamInfo.dislike_count = extractor.getDislikeCount();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.next_video = extractor.getNextVideo();
+            streamInfo.next_video = extractor.getNextVideo();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
-            videoInfo.related_videos = extractor.getRelatedVideos();
+            streamInfo.related_videos = extractor.getRelatedVideos();
         } catch(Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
         try {
 
         } catch (Exception e) {
-            videoInfo.addException(e);
+            streamInfo.addException(e);
         }
 
-        return videoInfo;
+        return streamInfo;
     }
 
     public String uploader_thumbnail_url = "";
@@ -227,20 +227,20 @@ public class VideoInfo extends AbstractVideoInfo {
     public int like_count = -1;
     public int dislike_count = -1;
     public String average_rating = "";
-    public VideoPreviewInfo next_video = null;
-    public List<VideoPreviewInfo> related_videos = null;
-    //in seconds. some metadata is not passed using a VideoInfo object!
+    public StreamPreviewInfo next_video = null;
+    public List<StreamPreviewInfo> related_videos = null;
+    //in seconds. some metadata is not passed using a StreamInfo object!
     public int start_position = 0;
     //todo: public int service_id = -1;
 
     public List<Exception> errors = new Vector<>();
 
-    public VideoInfo() {}
+    public StreamInfo() {}
 
-    /**Creates a new VideoInfo object from an existing AbstractVideoInfo.
-     * All the shared properties are copied to the new VideoInfo.*/
+    /**Creates a new StreamInfo object from an existing AbstractVideoInfo.
+     * All the shared properties are copied to the new StreamInfo.*/
     @SuppressWarnings("WeakerAccess")
-    public VideoInfo(AbstractVideoInfo avi) {
+    public StreamInfo(AbstractVideoInfo avi) {
         this.id = avi.id;
         this.title = avi.title;
         this.uploader = avi.uploader;
@@ -252,9 +252,9 @@ public class VideoInfo extends AbstractVideoInfo {
         this.view_count = avi.view_count;
 
         //todo: better than this
-        if(avi instanceof VideoPreviewInfo) {
+        if(avi instanceof StreamPreviewInfo) {
             //shitty String to convert code
-            String dur = ((VideoPreviewInfo)avi).duration;
+            String dur = ((StreamPreviewInfo)avi).duration;
             int minutes = Integer.parseInt(dur.substring(0, dur.indexOf(":")));
             int seconds = Integer.parseInt(dur.substring(dur.indexOf(":")+1, dur.length()));
             this.duration = (minutes*60)+seconds;
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/VideoPreviewInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfo.java
similarity index 84%
rename from app/src/main/java/org/schabi/newpipe/extractor/VideoPreviewInfo.java
rename to app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfo.java
index 29bab20bd..05d87799c 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/VideoPreviewInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfo.java
@@ -7,8 +7,8 @@ import android.os.Parcelable;
 /**
  * Created by Christian Schabesberger on 26.08.15.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
- * VideoPreviewInfo.java is part of NewPipe.
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamPreviewInfo.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,6 +25,6 @@ import android.os.Parcelable;
  */
 
 /**Info object for previews of unopened videos, eg search results, related videos*/
-public class VideoPreviewInfo extends AbstractVideoInfo {
+public class StreamPreviewInfo extends AbstractVideoInfo {
     public String duration = "";
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/VideoUrlIdHandler.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamUrlIdHandler.java
similarity index 93%
rename from app/src/main/java/org/schabi/newpipe/extractor/VideoUrlIdHandler.java
rename to app/src/main/java/org/schabi/newpipe/extractor/StreamUrlIdHandler.java
index 88736896f..4f91ac80e 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/VideoUrlIdHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamUrlIdHandler.java
@@ -4,7 +4,7 @@ package org.schabi.newpipe.extractor;
  * Created by Christian Schabesberger on 02.02.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * VideoUrlIdHandler.java is part of NewPipe.
+ * StreamUrlIdHandler.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@ package org.schabi.newpipe.extractor;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public interface VideoUrlIdHandler {
+public interface StreamUrlIdHandler {
     String getVideoUrl(String videoId);
     String getVideoId(String siteUrl) throws ParsingException;
     String cleanUrl(String siteUrl) throws ParsingException;
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
index 88e2757e4..5e929e9d1 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamingService.java
@@ -5,7 +5,7 @@ import java.io.IOException;
 /**
  * Created by Christian Schabesberger on 23.08.15.
  *
- * Copyright (C) Christian Schabesberger 2015 <chris.schabesberger@mailbox.org>
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
  * StreamingService.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@ public interface StreamingService {
             throws IOException, ExtractionException;
     SearchEngine getSearchEngineInstance();
 
-    VideoUrlIdHandler getUrlIdHandler();
+    StreamUrlIdHandler getUrlIdHandler();
 
 
 }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index ed0b09036..cf2b4c235 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -10,7 +10,7 @@ import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.Parser;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.SearchEngine;
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
@@ -99,11 +99,11 @@ public class YoutubeSearchEngine implements SearchEngine {
 
                     // video item type
                 } else if (!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
-                    VideoPreviewInfo resultItem = new VideoPreviewInfo();
+                    StreamPreviewInfo resultItem = new StreamPreviewInfo();
 
                     // importand information
                     resultItem.webpage_url = getWebpageUrl(item);
-                    resultItem.id = (new YoutubeVideoUrlIdHandler()).getVideoId(resultItem.webpage_url);
+                    resultItem.id = (new YoutubeStreamUrlIdHandler()).getVideoId(resultItem.webpage_url);
                     resultItem.title = getTitle(item);
 
                     // optional iformation
@@ -147,7 +147,7 @@ public class YoutubeSearchEngine implements SearchEngine {
     }
 
     @Override
-    public ArrayList<String> suggestionList(String query,String contentCountry, Downloader dl)
+    public ArrayList<String> suggestionList(String query, String contentCountry, Downloader dl)
             throws IOException, ParsingException {
 
         ArrayList<String> suggestions = new ArrayList<>();
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
index 768337043..f35ae4044 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java
@@ -4,7 +4,7 @@ import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.StreamExtractor;
 import org.schabi.newpipe.extractor.StreamingService;
-import org.schabi.newpipe.extractor.VideoUrlIdHandler;
+import org.schabi.newpipe.extractor.StreamUrlIdHandler;
 import org.schabi.newpipe.extractor.SearchEngine;
 
 import java.io.IOException;
@@ -40,7 +40,7 @@ public class YoutubeService implements StreamingService {
     @Override
     public StreamExtractor getExtractorInstance(String url, Downloader downloader)
             throws ExtractionException, IOException {
-        VideoUrlIdHandler urlIdHandler = new YoutubeVideoUrlIdHandler();
+        StreamUrlIdHandler urlIdHandler = new YoutubeStreamUrlIdHandler();
         if(urlIdHandler.acceptUrl(url)) {
             return new YoutubeStreamExtractor(url, downloader) ;
         }
@@ -54,7 +54,7 @@ public class YoutubeService implements StreamingService {
     }
 
     @Override
-    public VideoUrlIdHandler getUrlIdHandler() {
-        return new YoutubeVideoUrlIdHandler();
+    public StreamUrlIdHandler getUrlIdHandler() {
+        return new YoutubeStreamUrlIdHandler();
     }
 }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index 758fb86f6..4c6bf424f 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -14,11 +14,11 @@ import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.Parser;
 import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.VideoUrlIdHandler;
+import org.schabi.newpipe.extractor.StreamInfo;
+import org.schabi.newpipe.extractor.StreamPreviewInfo;
+import org.schabi.newpipe.extractor.StreamUrlIdHandler;
 import org.schabi.newpipe.extractor.StreamExtractor;
 import org.schabi.newpipe.extractor.MediaFormat;
-import org.schabi.newpipe.extractor.VideoInfo;
-import org.schabi.newpipe.extractor.VideoPreviewInfo;
 
 import java.io.IOException;
 import java.util.List;
@@ -179,7 +179,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     // cached values
     private static volatile String decryptionCode = "";
 
-    VideoUrlIdHandler urlidhandler = new YoutubeVideoUrlIdHandler();
+    StreamUrlIdHandler urlidhandler = new YoutubeStreamUrlIdHandler();
     String pageUrl = "";
 
     private Downloader downloader;
@@ -433,8 +433,8 @@ public class YoutubeStreamExtractor implements StreamExtractor {
 
 
     @Override
-    public List<VideoInfo.AudioStream> getAudioStreams() throws ParsingException {
-        Vector<VideoInfo.AudioStream> audioStreams = new Vector<>();
+    public List<StreamInfo.AudioStream> getAudioStreams() throws ParsingException {
+        Vector<StreamInfo.AudioStream> audioStreams = new Vector<>();
         try{
             String encoded_url_map;
             // playerArgs could be null if the video is age restricted
@@ -461,7 +461,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
                                     + decryptSignature(tags.get("s"), decryptionCode);
                         }
 
-                        audioStreams.add(new VideoInfo.AudioStream(streamUrl,
+                        audioStreams.add(new StreamInfo.AudioStream(streamUrl,
                                 itagItem.mediaFormatId,
                                 itagItem.bandWidth,
                                 itagItem.samplingRate));
@@ -475,8 +475,8 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     }
 
     @Override
-    public List<VideoInfo.VideoStream> getVideoStreams() throws ParsingException {
-        Vector<VideoInfo.VideoStream> videoStreams = new Vector<>();
+    public List<StreamInfo.VideoStream> getVideoStreams() throws ParsingException {
+        Vector<StreamInfo.VideoStream> videoStreams = new Vector<>();
 
         try{
             String encoded_url_map;
@@ -504,7 +504,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
                                 streamUrl = streamUrl + "&signature="
                                         + decryptSignature(tags.get("s"), decryptionCode);
                             }
-                            videoStreams.add(new VideoInfo.VideoStream(
+                            videoStreams.add(new StreamInfo.VideoStream(
                                     streamUrl,
                                     itagItem.mediaFormatId,
                                     itagItem.resolutionString));
@@ -527,7 +527,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     }
 
     @Override
-    public List<VideoInfo.VideoStream> getVideoOnlyStreams() throws ParsingException {
+    public List<StreamInfo.VideoStream> getVideoOnlyStreams() throws ParsingException {
         return null;
     }
 
@@ -638,7 +638,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     }
 
     @Override
-    public VideoPreviewInfo getNextVideo() throws ParsingException {
+    public StreamPreviewInfo getNextVideo() throws ParsingException {
         try {
             return extractVideoPreviewInfo(doc.select("div[class=\"watch-sidebar-section\"]").first()
                     .select("li").first());
@@ -648,9 +648,9 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     }
 
     @Override
-    public Vector<VideoPreviewInfo> getRelatedVideos() throws ParsingException {
+    public Vector<StreamPreviewInfo> getRelatedVideos() throws ParsingException {
         try {
-            Vector<VideoPreviewInfo> relatedVideos = new Vector<>();
+            Vector<StreamPreviewInfo> relatedVideos = new Vector<>();
             for (Element li : doc.select("ul[id=\"watch-related\"]").first().children()) {
                 // first check if we have a playlist. If so leave them out
                 if (li.select("a[class*=\"content-link\"]").first() != null) {
@@ -664,8 +664,8 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     }
 
     @Override
-    public VideoUrlIdHandler getUrlIdConverter() {
-        return new YoutubeVideoUrlIdHandler();
+    public StreamUrlIdHandler getUrlIdConverter() {
+        return new YoutubeStreamUrlIdHandler();
     }
 
     @Override
@@ -674,10 +674,10 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     }
 
     /**Provides information about links to other videos on the video page, such as related videos.
-     * This is encapsulated in a VideoPreviewInfo object,
-     * which is a subset of the fields in a full VideoInfo.*/
-    private VideoPreviewInfo extractVideoPreviewInfo(Element li) throws ParsingException {
-        VideoPreviewInfo info = new VideoPreviewInfo();
+     * This is encapsulated in a StreamPreviewInfo object,
+     * which is a subset of the fields in a full StreamInfo.*/
+    private StreamPreviewInfo extractVideoPreviewInfo(Element li) throws ParsingException {
+        StreamPreviewInfo info = new StreamPreviewInfo();
 
         try {
             info.webpage_url = li.select("a.content-link").first()
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeVideoUrlIdHandler.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java
similarity index 93%
rename from app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeVideoUrlIdHandler.java
rename to app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java
index c74924cc1..4edc6cd91 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeVideoUrlIdHandler.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java
@@ -2,7 +2,7 @@ package org.schabi.newpipe.extractor.services.youtube;
 
 import org.schabi.newpipe.extractor.Parser;
 import org.schabi.newpipe.extractor.ParsingException;
-import org.schabi.newpipe.extractor.VideoUrlIdHandler;
+import org.schabi.newpipe.extractor.StreamUrlIdHandler;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
@@ -11,7 +11,7 @@ import java.net.URLDecoder;
  * Created by Christian Schabesberger on 02.02.16.
  *
  * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
- * YoutubeVideoUrlIdHandler.java is part of NewPipe.
+ * YoutubeStreamUrlIdHandler.java is part of NewPipe.
  *
  * NewPipe is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ import java.net.URLDecoder;
  * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public class YoutubeVideoUrlIdHandler implements VideoUrlIdHandler {
+public class YoutubeStreamUrlIdHandler implements StreamUrlIdHandler {
     @SuppressWarnings("WeakerAccess")
     @Override
     public String getVideoUrl(String videoId) {

From 737a41f45b55a4a1a83a509b1e1ee295071bf11e Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Sat, 27 Feb 2016 17:02:38 +0100
Subject: [PATCH 10/22] display error message

---
 app/src/main/java/org/schabi/newpipe/ErrorActivity.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index 594026f7a..be84019f8 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -22,6 +22,7 @@ import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.json.JSONArray;
@@ -94,6 +95,7 @@ public class ErrorActivity extends AppCompatActivity {
 
     public static void reportError(final Context context, final List<Exception> el,
                                    final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
+
         if (rootView != null) {
             Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
                     .setAction(R.string.error_snackbar_action, new View.OnClickListener() {
@@ -181,6 +183,9 @@ public class ErrorActivity extends AppCompatActivity {
 
         globIpRangeThread = new Thread(new IpRagneRequester());
         globIpRangeThread.start();
+
+        Toast.makeText(this,
+                errorInfo.message, Toast.LENGTH_LONG).show();
     }
 
     @Override

From d7e75e60116fc4e8bb681efff3cc68380eb54a12 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 15:59:06 +0100
Subject: [PATCH 11/22] restructured search engine

---
 .../schabi/newpipe/VideoItemListFragment.java |  15 +-
 .../newpipe/extractor/SearchEngine.java       |   8 +-
 .../newpipe/extractor/SearchResult.java       |  41 ++++
 .../newpipe/extractor/StreamPreviewInfo.java  |   4 -
 .../extractor/StreamPreviewInfoCollector.java |  91 ++++++++
 .../extractor/StreamPreviewInfoExtractor.java |  31 +++
 .../services/youtube/YoutubeSearchEngine.java | 203 ++++++++----------
 7 files changed, 261 insertions(+), 132 deletions(-)
 create mode 100644 app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoCollector.java
 create mode 100644 app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoExtractor.java

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index af659bfc4..ac1d1a2cd 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.util.List;
 
 import org.schabi.newpipe.extractor.ExtractionException;
+import org.schabi.newpipe.extractor.SearchResult;
 import org.schabi.newpipe.extractor.StreamPreviewInfo;
 import org.schabi.newpipe.extractor.SearchEngine;
 import org.schabi.newpipe.extractor.StreamingService;
@@ -67,9 +68,9 @@ public class VideoItemListFragment extends ListFragment {
     private boolean loadingNextPage = true;
 
     private class ResultRunnable implements Runnable {
-        private final SearchEngine.Result result;
+        private final SearchResult result;
         private final int requestId;
-        public ResultRunnable(SearchEngine.Result result, int requestId) {
+        public ResultRunnable(SearchResult result, int requestId) {
             this.result = result;
             this.requestId = requestId;
         }
@@ -105,8 +106,8 @@ public class VideoItemListFragment extends ListFragment {
                 String searchLanguageKey = getContext().getString(R.string.search_language_key);
                 String searchLanguage = sp.getString(searchLanguageKey,
                         getString(R.string.default_language_value));
-                SearchEngine.Result result = engine.search(query, page, searchLanguage,
-                        new Downloader());
+                SearchResult result = SearchResult
+                        .getSearchResult(engine, query, page, searchLanguage, new Downloader());
 
                 //Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
                 if(runs) {
@@ -165,12 +166,10 @@ public class VideoItemListFragment extends ListFragment {
         this.streamingService = streamingService;
     }
 
-    private void updateListOnResult(SearchEngine.Result result, int requestId) {
+    private void updateListOnResult(SearchResult result, int requestId) {
         if(requestId == currentRequestId) {
             setListShown(true);
-            if (result.resultList.isEmpty()) {
-                Toast.makeText(getActivity(), result.errorMessage, Toast.LENGTH_LONG).show();
-            } else {
+            if (!result.resultList.isEmpty()) {
                 if (!result.suggestion.isEmpty()) {
                     Toast.makeText(getActivity(), getString(R.string.did_you_mean) + result.suggestion + " ?",
                             Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
index 9b084b9d8..0c230a59b 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
@@ -27,16 +27,10 @@ import java.util.Vector;
 
 @SuppressWarnings("ALL")
 public interface SearchEngine {
-    class Result {
-        public String errorMessage = "";
-        public String suggestion = "";
-        public final List<StreamPreviewInfo> resultList = new Vector<>();
-    }
-
     ArrayList<String> suggestionList(String query,String contentCountry, Downloader dl)
             throws ExtractionException, IOException;
 
     //Result search(String query, int page);
-    Result search(String query, int page, String contentCountry, Downloader dl)
+    StreamPreviewInfoCollector search(String query, int page, String contentCountry, Downloader dl)
             throws ExtractionException, IOException;
 }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java b/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
new file mode 100644
index 000000000..4aac7aaf1
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
@@ -0,0 +1,41 @@
+package org.schabi.newpipe.extractor;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Vector;
+
+/**
+ * Created by Christian Schabesberger on 29.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * SearchResult.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class SearchResult {
+    public static SearchResult getSearchResult(SearchEngine engine, String query,
+                                               int page, String languageCode, Downloader dl)
+            throws ExtractionException, IOException {
+        try {
+            return engine.search(query, page, languageCode, dl).getSearchResult();
+        } catch (Exception e) {
+            throw new ExtractionException("Could not get any search result", e);
+        }
+    }
+
+    public String suggestion = "";
+    public final List<StreamPreviewInfo> resultList = new Vector<>();
+    public List<Exception> errors = new Vector<>();
+}
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfo.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfo.java
index 05d87799c..5ab1f75fc 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfo.java
@@ -1,9 +1,5 @@
 package org.schabi.newpipe.extractor;
 
-import android.graphics.Bitmap;
-import android.os.Parcel;
-import android.os.Parcelable;
-
 /**
  * Created by Christian Schabesberger on 26.08.15.
  *
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoCollector.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoCollector.java
new file mode 100644
index 000000000..c22670065
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoCollector.java
@@ -0,0 +1,91 @@
+package org.schabi.newpipe.extractor;
+
+import org.schabi.newpipe.extractor.services.youtube.YoutubeStreamUrlIdHandler;
+
+/**
+ * Created by Christian Schabesberger on 28.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamPreviewInfoCollector.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public class StreamPreviewInfoCollector {
+    SearchResult result = new SearchResult();
+    StreamUrlIdHandler urlIdHandler = null;
+
+    public StreamPreviewInfoCollector(StreamUrlIdHandler handler) {
+        urlIdHandler = handler;
+    }
+
+    public void setSuggestion(String suggestion) {
+        result.suggestion = suggestion;
+    }
+
+    public void addError(Exception e) {
+        result.errors.add(e);
+    }
+
+    public SearchResult getSearchResult() {
+        return result;
+    }
+
+    public void commit(StreamPreviewInfoExtractor extractor) throws ParsingException {
+        try {
+            StreamPreviewInfo resultItem = new StreamPreviewInfo();
+            // importand information
+            resultItem.webpage_url = extractor.getWebPageUrl();
+            if (urlIdHandler == null) {
+                throw new ParsingException("Error: UrlIdHandler not set");
+            } else {
+                resultItem.id = (new YoutubeStreamUrlIdHandler()).getVideoId(resultItem.webpage_url);
+            }
+            resultItem.title = extractor.getTitle();
+
+            // optional iformation
+            try {
+                resultItem.duration = extractor.getDuration();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.uploader = extractor.getUploader();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.upload_date = extractor.getUploadDate();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.view_count = extractor.getViewCount();
+            } catch (Exception e) {
+                addError(e);
+            }
+            try {
+                resultItem.thumbnail_url = extractor.getThumbnailUrl();
+            } catch (Exception e) {
+                addError(e);
+            }
+
+
+            result.resultList.add(resultItem);
+        } catch (Exception e) {
+            addError(e);
+        }
+
+    }
+}
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoExtractor.java
new file mode 100644
index 000000000..4146acd84
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamPreviewInfoExtractor.java
@@ -0,0 +1,31 @@
+package org.schabi.newpipe.extractor;
+
+/**
+ * Created by Christian Schabesberger on 28.02.16.
+ *
+ * Copyright (C) Christian Schabesberger 2016 <chris.schabesberger@mailbox.org>
+ * StreamPreviewInfoExtractor.java is part of NewPipe.
+ *
+ * NewPipe is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * NewPipe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with NewPipe.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+public interface StreamPreviewInfoExtractor {
+    String getWebPageUrl() throws ParsingException;
+    String getTitle() throws ParsingException;
+    String getDuration() throws ParsingException;
+    String getUploader() throws ParsingException;
+    String getUploadDate() throws ParsingException;
+    long getViewCount() throws  ParsingException;
+    String getThumbnailUrl() throws  ParsingException;
+}
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index cf2b4c235..83b8dab36 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -10,7 +10,9 @@ import org.schabi.newpipe.extractor.Downloader;
 import org.schabi.newpipe.extractor.Parser;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.SearchEngine;
-import org.schabi.newpipe.extractor.StreamPreviewInfo;
+import org.schabi.newpipe.extractor.StreamExtractor;
+import org.schabi.newpipe.extractor.StreamPreviewInfoCollector;
+import org.schabi.newpipe.extractor.StreamPreviewInfoExtractor;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
@@ -49,9 +51,10 @@ public class YoutubeSearchEngine implements SearchEngine {
     private static final String TAG = YoutubeSearchEngine.class.toString();
 
     @Override
-    public Result search(String query, int page, String languageCode, Downloader downloader)
+    public StreamPreviewInfoCollector search(String query, int page, String languageCode, Downloader downloader)
             throws IOException, ParsingException {
-        Result result = new Result();
+        StreamPreviewInfoCollector collector = new StreamPreviewInfoCollector(
+                new YoutubeStreamUrlIdHandler());
         Uri.Builder builder = new Uri.Builder();
         builder.scheme("https")
                 .authority("www.youtube.com")
@@ -71,12 +74,11 @@ public class YoutubeSearchEngine implements SearchEngine {
             site = downloader.download(url);
         }
 
-        try {
 
-            Document doc = Jsoup.parse(site, url);
-            Element list = doc.select("ol[class=\"item-section\"]").first();
+        Document doc = Jsoup.parse(site, url);
+        Element list = doc.select("ol[class=\"item-section\"]").first();
 
-            for (Element item : list.children()) {
+        for (Element item : list.children()) {
             /* 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
@@ -88,62 +90,26 @@ public class YoutubeSearchEngine implements SearchEngine {
                playlists now.
             */
 
-                Element el;
+            Element el;
 
-                // both types of spell correction item
-                if (!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
-                    result.suggestion = el.select("a").first().text();
-                    // search message item
-                } else if (!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
-                    result.errorMessage = el.text();
+            // both types of spell correction item
+            if (!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
+                collector.setSuggestion(el.select("a").first().text());
+                // search message item
+            } else if (!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
+                //result.errorMessage = el.text();
+                throw new StreamExtractor.ContentNotAvailableException(el.text());
 
-                    // video item type
-                } else if (!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
-                    StreamPreviewInfo resultItem = new StreamPreviewInfo();
-
-                    // importand information
-                    resultItem.webpage_url = getWebpageUrl(item);
-                    resultItem.id = (new YoutubeStreamUrlIdHandler()).getVideoId(resultItem.webpage_url);
-                    resultItem.title = getTitle(item);
-
-                    // optional iformation
-                    //todo: make this a proper error handling
-                    try {
-                        resultItem.duration = getDuration(item);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    try {
-                        resultItem.uploader = getUploader(item);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    try {
-                        resultItem.upload_date = getUploadDate(item);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    try {
-                        resultItem.view_count = getViewCount(item);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                    try {
-                        resultItem.thumbnail_url = getThumbnailUrl(item);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-
-                    result.resultList.add(resultItem);
-                } else {
-                    //noinspection ConstantConditions
-                    Log.e(TAG, "unexpected element found:\"" + el + "\"");
-                }
+                // video item type
+            } else if (!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
+                collector.commit(extractPreviewInfo(el));
+            } else {
+                //noinspection ConstantConditions
+                collector.addError(new Exception("unexpected element found:\"" + el + "\""));
             }
-        } catch(Exception e) {
-            throw new ParsingException(e);
         }
-        return result;
+
+        return collector;
     }
 
     @Override
@@ -203,67 +169,78 @@ public class YoutubeSearchEngine implements SearchEngine {
         }
     }
 
-    private String getWebpageUrl(Element item) {
-        Element el = item.select("div[class*=\"yt-lockup-video\"").first();
-        Element dl = el.select("h3").first().select("a").first();
-        return dl.attr("abs:href");
-    }
+    private StreamPreviewInfoExtractor extractPreviewInfo(final Element item) {
+        return new StreamPreviewInfoExtractor() {
+            @Override
+            public String getWebPageUrl() throws ParsingException {
+                Element el = item.select("div[class*=\"yt-lockup-video\"").first();
+                Element dl = el.select("h3").first().select("a").first();
+                return dl.attr("abs:href");
+            }
 
-    private String getTitle(Element item) {
-        Element el = item.select("div[class*=\"yt-lockup-video\"").first();
-        Element dl = el.select("h3").first().select("a").first();
-        return dl.text();
-    }
+            @Override
+            public String getTitle() throws ParsingException {
+                Element el = item.select("div[class*=\"yt-lockup-video\"").first();
+                Element dl = el.select("h3").first().select("a").first();
+                return dl.text();
+            }
 
-    private String getDuration(Element item) {
-        try {
-            return item.select("span[class=\"video-time\"]").first().text();
-        } catch(Exception e) {
-            e.printStackTrace();
-        }
-        return "";
-    }
+            @Override
+            public String getDuration() throws ParsingException {
+                try {
+                    return item.select("span[class=\"video-time\"]").first().text();
+                } catch(Exception e) {
+                    e.printStackTrace();
+                }
+                return "";
+            }
 
-    private String getUploader(Element item) {
-        return item.select("div[class=\"yt-lockup-byline\"]").first()
-                .select("a").first()
-                .text();
-    }
+            @Override
+            public String getUploader() throws ParsingException {
+                return item.select("div[class=\"yt-lockup-byline\"]").first()
+                        .select("a").first()
+                        .text();
+            }
 
-    private String getUploadDate(Element item) {
-        return item.select("div[class=\"yt-lockup-meta\"]").first()
-                .select("li").first()
-                .text();
-    }
+            @Override
+            public String getUploadDate() throws ParsingException {
+                return item.select("div[class=\"yt-lockup-meta\"]").first()
+                        .select("li").first()
+                        .text();
+            }
 
-    private long getViewCount(Element item) throws Parser.RegexException{
-        String output;
-        String input = item.select("div[class=\"yt-lockup-meta\"]").first()
-                .select("li").get(1)
-                .text();
-        output = Parser.matchGroup1("([0-9,\\. ]*)", input)
-                .replace(" ", "")
-                .replace(".", "")
-                .replace(",", "");
+            @Override
+            public long getViewCount() throws ParsingException {
+                String output;
+                String input = item.select("div[class=\"yt-lockup-meta\"]").first()
+                        .select("li").get(1)
+                        .text();
+                output = Parser.matchGroup1("([0-9,\\. ]*)", input)
+                        .replace(" ", "")
+                        .replace(".", "")
+                        .replace(",", "");
 
-        if(Long.parseLong(output) == 30) {
-            Log.d(TAG, "bla");
-        }
-        return Long.parseLong(output);
-    }
+                if(Long.parseLong(output) == 30) {
+                    Log.d(TAG, "bla");
+                }
+                return Long.parseLong(output);
+            }
 
-    private String getThumbnailUrl(Element item) {
-        String url;
-        Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
-                .select("img").first();
-        url = te.attr("abs:src");
-        // 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've caught such an item.
-        if (url.contains(".gif")) {
-            url = te.attr("abs:data-thumb");
-        }
+            @Override
+            public String getThumbnailUrl() throws ParsingException {
+                String url;
+                Element te = item.select("div[class=\"yt-thumb video-thumb\"]").first()
+                        .select("img").first();
+                url = te.attr("abs:src");
+                // 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've caught such an item.
+                if (url.contains(".gif")) {
+                    url = te.attr("abs:data-thumb");
+                }
 
-        return url;
+                return url;
+            }
+        };
     }
 }

From 1a2840b33fb2e28a97a29e1372da6b1514fa9497 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 16:10:46 +0100
Subject: [PATCH 12/22] made ui handle missing information on search

---
 .../newpipe/VideoInfoItemViewCreator.java     | 33 ++++++++++++++++---
 .../newpipe/VideoItemDetailFragment.java      |  4 +--
 .../org/schabi/newpipe/VideoListAdapter.java  |  2 +-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
index 0c909e325..b9dbebea8 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoInfoItemViewCreator.java
@@ -41,8 +41,10 @@ class VideoInfoItemViewCreator {
         this.inflater = inflater;
     }
 
-    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, StreamPreviewInfo info, Context context) {
+    public View getViewFromVideoInfoItem(View convertView, ViewGroup parent, StreamPreviewInfo info) {
         ViewHolder holder;
+
+        // generate holder
         if(convertView == null) {
             convertView = inflater.inflate(R.layout.video_item, parent, false);
             holder = new ViewHolder();
@@ -57,20 +59,41 @@ class VideoInfoItemViewCreator {
             holder = (ViewHolder) convertView.getTag();
         }
 
+        // fill with information
+
+        /*
         if(info.thumbnail == null) {
             holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
         } else {
             holder.itemThumbnailView.setImageBitmap(info.thumbnail);
         }
+        */
         holder.itemVideoTitleView.setText(info.title);
-        holder.itemUploaderView.setText(info.uploader);
-        holder.itemDurationView.setText(info.duration);
-        holder.itemViewCountView.setText(shortViewCount(info.view_count));
+        if(info.uploader != null && !info.uploader.isEmpty()) {
+            holder.itemUploaderView.setText(info.uploader);
+        } else {
+            holder.itemDurationView.setVisibility(View.INVISIBLE);
+        }
+        if(info.duration != null && !info.duration.isEmpty()) {
+            holder.itemDurationView.setText(info.duration);
+        } else {
+            holder.itemDurationView.setVisibility(View.GONE);
+        }
+        if(info.view_count >= 0) {
+            holder.itemViewCountView.setText(shortViewCount(info.view_count));
+        } else {
+            holder.itemViewCountView.setVisibility(View.GONE);
+        }
         if(!info.upload_date.isEmpty()) {
             holder.itemUploadDateView.setText(info.upload_date+" • ");
         }
 
-        imageLoader.displayImage(info.thumbnail_url, holder.itemThumbnailView, displayImageOptions);
+        if(info.thumbnail_url != null && !info.thumbnail_url.isEmpty()) {
+            imageLoader.displayImage(info.thumbnail_url, holder.itemThumbnailView, displayImageOptions);
+        } else {
+            holder.itemThumbnailView.setImageResource(R.drawable.dummy_thumbnail);
+        }
+
 
         return convertView;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index 50e0aeaba..d86b195de 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -290,7 +290,7 @@ public class VideoItemDetailFragment extends Fragment {
             View nextVideoView = null;
             if(info.next_video != null) {
                 nextVideoView = videoItemViewCreator
-                        .getViewFromVideoInfoItem(null, nextVideoFrame, info.next_video, getContext());
+                        .getViewFromVideoInfoItem(null, nextVideoFrame, info.next_video);
             } else {
                 activity.findViewById(R.id.detailNextVidButtonAndContentLayout).setVisibility(View.GONE);
                 activity.findViewById(R.id.detailNextVideoTitle).setVisibility(View.GONE);
@@ -672,7 +672,7 @@ public class VideoItemDetailFragment extends Fragment {
         ArrayList<StreamPreviewInfo> similar = new ArrayList<>(info.related_videos);
         for (final StreamPreviewInfo item : similar) {
             View similarView = videoItemViewCreator
-                    .getViewFromVideoInfoItem(null, similarLayout, item, getContext());
+                    .getViewFromVideoInfoItem(null, similarLayout, item);
 
             similarView.setClickable(true);
             similarView.setFocusable(true);
diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
index 06dab38b4..d69b842cf 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -78,7 +78,7 @@ class VideoListAdapter extends BaseAdapter {
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        convertView = viewCreator.getViewFromVideoInfoItem(convertView, parent, videoList.get(position), context);
+        convertView = viewCreator.getViewFromVideoInfoItem(convertView, parent, videoList.get(position));
 
         if(listView.isItemChecked(position)) {
             convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.light_youtube_primary_color));

From 4ac36af40ca4f868ee08069f6bcb4e5793b1bcf9 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 16:11:29 +0100
Subject: [PATCH 13/22] made extractor not throw exception upon missing dash
 mpd

---
 .../extractor/services/youtube/YoutubeStreamExtractor.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index 4c6bf424f..b2560fe39 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -412,7 +412,6 @@ public class YoutubeStreamExtractor implements StreamExtractor {
 
     @Override
     public String getDashMpdUrl() throws ParsingException {
-        throw new ParsingException("blabla");
         /*
         try {
             String dashManifestUrl = videoInfoPage.get("dashmpd");
@@ -429,6 +428,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
                     "Could not get \"dashmpd\" maybe VideoInfoPage is broken.", e);
         }
         */
+        return "";
     }
 
 

From 1829dc79c8a72c02ab7966aa28dcad994a869c37 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 19:02:40 +0100
Subject: [PATCH 14/22] make erroractivity handle search engine exceptions

---
 .../newpipe/VideoItemDetailFragment.java      | 37 ++++++++++-------
 .../schabi/newpipe/VideoItemListFragment.java | 40 ++++++++++++++++---
 .../services/youtube/YoutubeSearchEngine.java |  3 ++
 3 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index d86b195de..d5d6ff052 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -133,6 +133,28 @@ public class VideoItemDetailFragment extends Fragment {
                 streamInfo = StreamInfo.getVideoInfo(streamExtractor, new Downloader());
 
                 h.post(new VideoResultReturnedRunnable(streamInfo));
+
+                // look for errors during extraction
+                // this if statement only covers extra information.
+                // if these are not available or caused an error, they are just not available
+                // but don't render the stream information unusalbe.
+                if(streamInfo != null &&
+                        !streamInfo.errors.isEmpty()) {
+                    Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
+                    for (Exception e : streamInfo.errors) {
+                        e.printStackTrace();
+                        Log.e(TAG, "------");
+                    }
+
+                    Activity a = getActivity();
+                    View rootView = a != null ? a.findViewById(R.id.videoitem_detail) : null;
+                    ErrorActivity.reportError(h, getActivity(),
+                            streamInfo.errors, null, rootView,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
+                                    service.getServiceInfo().name, videoUrl, 0 /* no message for the user */));
+                }
+
+                // These errors render the stream information unusable.
             } catch (IOException e) {
                 postNewErrorToast(h, R.string.network_error);
                 e.printStackTrace();
@@ -205,21 +227,6 @@ public class VideoItemDetailFragment extends Fragment {
                             }
                         });
                 e.printStackTrace();
-            } finally {
-                if(streamInfo != null &&
-                        !streamInfo.errors.isEmpty()) {
-                    Log.e(TAG, "OCCURRED ERRORS DURING EXTRACTION:");
-                    for(Exception e : streamInfo.errors) {
-                        e.printStackTrace();
-                    }
-
-                    Activity a = getActivity();
-                    View rootView = a != null ? a.findViewById(R.id.videoitem_detail) : null;
-                    ErrorActivity.reportError(h, getActivity(),
-                            streamInfo.errors, null, rootView,
-                            ErrorActivity.ErrorInfo.make(ErrorActivity.REQUESTED_STREAM,
-                                    service.getServiceInfo().name,  videoUrl, 0 /* no message for the user */));
-                }
             }
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index ac1d1a2cd..7dc01bd38 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -1,5 +1,6 @@
 package org.schabi.newpipe;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -101,26 +102,53 @@ public class VideoItemListFragment extends ListFragment {
         }
         @Override
         public void run() {
+            SearchResult result = null;
             try {
                 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getContext());
                 String searchLanguageKey = getContext().getString(R.string.search_language_key);
                 String searchLanguage = sp.getString(searchLanguageKey,
                         getString(R.string.default_language_value));
-                SearchResult result = SearchResult
+                result = SearchResult
                         .getSearchResult(engine, query, page, searchLanguage, new Downloader());
 
-                //Log.i(TAG, "language code passed:\""+searchLanguage+"\"");
                 if(runs) {
                     h.post(new ResultRunnable(result, requestId));
                 }
+
+                // look for errors during extraction
+                // soft errors:
+                if(result != null &&
+                        !result.errors.isEmpty()) {
+                    Log.e(TAG, "OCCURRED ERRORS DURING SEARCH EXTRACTION:");
+                    for(Exception e : result.errors) {
+                        e.printStackTrace();
+                        Log.e(TAG, "------");
+                    }
+
+                    Activity a = getActivity();
+                    View rootView = a.findViewById(R.id.videoitem_list);
+                    ErrorActivity.reportError(h, getActivity(), result.errors, null, rootView,
+                            ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.general_error));
+
+                }
+                // hard errors:
             } catch(IOException e) {
                 postNewErrorToast(h, R.string.network_error);
                 e.printStackTrace();
-            } catch(ExtractionException ce) {
-                postNewErrorToast(h, R.string.parsing_error);
-                ce.printStackTrace();
+            } catch(ExtractionException e) {
+                ErrorActivity.reportError(h, getActivity(), e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.parsing_error));
+
+                //postNewErrorToast(h, R.string.parsing_error);
+                e.printStackTrace();
+
             } catch(Exception e) {
-                postNewErrorToast(h, R.string.general_error);
+                ErrorActivity.reportError(h, getActivity(), e, null, null,
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.general_error));
+
                 e.printStackTrace();
             }
         }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index 83b8dab36..6afed94eb 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -211,6 +211,8 @@ public class YoutubeSearchEngine implements SearchEngine {
 
             @Override
             public long getViewCount() throws ParsingException {
+                throw new ParsingException("blabla");
+                /*
                 String output;
                 String input = item.select("div[class=\"yt-lockup-meta\"]").first()
                         .select("li").get(1)
@@ -224,6 +226,7 @@ public class YoutubeSearchEngine implements SearchEngine {
                     Log.d(TAG, "bla");
                 }
                 return Long.parseLong(output);
+                */
             }
 
             @Override

From 18493a578d33f4508a31422d1fd00615bbf4e46e Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 19:23:01 +0100
Subject: [PATCH 15/22] made error message be displayed inside erroractivity

---
 .../org/schabi/newpipe/ErrorActivity.java     |  5 +++--
 .../schabi/newpipe/VideoItemListFragment.java |  2 +-
 app/src/main/res/layout/activity_error.xml    | 19 +++++++++++++++++--
 app/src/main/res/values/strings.xml           |  2 ++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index be84019f8..5ddb9b988 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -92,6 +92,7 @@ public class ErrorActivity extends AppCompatActivity {
     private EditText userCommentBox;
     private Button reportButton;
     private TextView infoView;
+    private TextView errorMessageView;
 
     public static void reportError(final Context context, final List<Exception> el,
                                    final Class returnAcitivty, View rootView, final ErrorInfo errorInfo) {
@@ -159,6 +160,7 @@ public class ErrorActivity extends AppCompatActivity {
         userCommentBox = (EditText) findViewById(R.id.errorCommentBox);
         errorView = (TextView) findViewById(R.id.errorView);
         infoView = (TextView) findViewById(R.id.errorInfosView);
+        errorMessageView = (TextView) findViewById(R.id.errorMessageView);
 
         errorView.setText(formErrorText(errorList));
 
@@ -184,8 +186,7 @@ public class ErrorActivity extends AppCompatActivity {
         globIpRangeThread = new Thread(new IpRagneRequester());
         globIpRangeThread.start();
 
-        Toast.makeText(this,
-                errorInfo.message, Toast.LENGTH_LONG).show();
+        errorMessageView.setText(errorInfo.message);
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index 7dc01bd38..fc931f2f7 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -129,7 +129,7 @@ public class VideoItemListFragment extends ListFragment {
                     View rootView = a.findViewById(R.id.videoitem_list);
                     ErrorActivity.reportError(h, getActivity(), result.errors, null, rootView,
                             ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
-                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.general_error));
+                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.light_parsing_error));
 
                 }
                 // hard errors:
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
index 68f61eeb3..c6684263f 100644
--- a/app/src/main/res/layout/activity_error.xml
+++ b/app/src/main/res/layout/activity_error.xml
@@ -30,6 +30,21 @@
                 android:text="@string/sorry_string"
                 android:textStyle="bold" />
 
+            <TextView
+                android:id="@+id/messageWhatHappenedView"
+                android:paddingTop="@dimen/activity_vertical_margin"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/what_happened_headline"/>
+
+            <TextView
+                android:id="@+id/errorMessageView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/black"
+                android:text="@string/info_labels"/>
+
             <TextView
                 android:id="@+id/errorDeviceHeadlineView"
                 android:paddingTop="@dimen/activity_vertical_margin"
@@ -66,12 +81,12 @@
             </LinearLayout>
 
             <TextView
-                android:id="@+id/errorWhatHappenedView"
+                android:id="@+id/errorDetailView"
                 android:paddingTop="@dimen/activity_vertical_margin"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/what_happened_headline"/>
+                android:text="@string/error_details_headline"/>
 
             <HorizontalScrollView
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 95ed0e1a6..cbaa45111 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -84,6 +84,7 @@
     <string name="could_not_load_thumbnails">Could not load all Thumbnails</string>
     <string name="youtube_signature_decryption_error">Could not decrypt video url signature.</string>
     <string name="parsing_error">Could not parse website.</string>
+    <string name="light_parsing_error">Could not parse website complete.</string>
     <string name="content_not_available">Content not available.</string>
     <string name="blocked_by_gema">Blocked by GEMA.</string>
     <string name="could_not_setup_download_menu">Could not setup download menu.</string>
@@ -101,6 +102,7 @@
     <string name="info_searched_lbl">Searched for:</string>
     <string name="info_requested_stream_lbl">Requested stream:</string>
     <string name="your_comment">Your comment (in English):</string>
+    <string name="error_details_headline">Details:</string>
 
 
     <!-- Content descriptions (for better accessibility) -->

From 028354b283f8c7373708f308fb51926445c25c3b Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 20:33:28 +0100
Subject: [PATCH 16/22] fixed some bugs

---
 .../org/schabi/newpipe/ErrorActivity.java     |  1 +
 .../schabi/newpipe/VideoItemListFragment.java | 31 +++++++++++++------
 .../newpipe/extractor/SearchEngine.java       |  6 ++++
 .../newpipe/extractor/SearchResult.java       |  9 +++---
 .../services/youtube/YoutubeSearchEngine.java | 20 +++++++-----
 app/src/main/res/values/strings.xml           |  2 +-
 6 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index 5ddb9b988..5c34fbced 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -114,6 +114,7 @@ public class ErrorActivity extends AppCompatActivity {
             ActivityCommunicator ac = ActivityCommunicator.getCommunicator();
             ac.errorList = el;
             ac.returnActivity = returnAcitivty;
+            ac.errorInfo = errorInfo;
             Intent intent = new Intent(context, ErrorActivity.class);
             context.startActivity(intent);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index fc931f2f7..fc20aadb9 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -134,13 +134,14 @@ public class VideoItemListFragment extends ListFragment {
                 }
                 // hard errors:
             } catch(IOException e) {
-                postNewErrorToast(h, R.string.network_error);
+                postNewNothingFoundToast(h, R.string.network_error);
                 e.printStackTrace();
+            } catch(SearchEngine.NothingFoundException e) {
+                postNewErrorToast(h, e.getMessage());
             } catch(ExtractionException e) {
                 ErrorActivity.reportError(h, getActivity(), e, null, null,
                         ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
                         /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.parsing_error));
-
                 //postNewErrorToast(h, R.string.parsing_error);
                 e.printStackTrace();
 
@@ -197,12 +198,11 @@ public class VideoItemListFragment extends ListFragment {
     private void updateListOnResult(SearchResult result, int requestId) {
         if(requestId == currentRequestId) {
             setListShown(true);
-            if (!result.resultList.isEmpty()) {
-                if (!result.suggestion.isEmpty()) {
-                    Toast.makeText(getActivity(), getString(R.string.did_you_mean) + result.suggestion + " ?",
-                            Toast.LENGTH_LONG).show();
-                }
-                updateList(result.resultList);
+            updateList(result.resultList);
+            if(!result.suggestion.isEmpty()) {
+                Toast.makeText(getActivity(),
+                        String.format(getString(R.string.did_you_mean), result.suggestion),
+                        Toast.LENGTH_LONG).show();
             }
         }
     }
@@ -344,13 +344,24 @@ public class VideoItemListFragment extends ListFragment {
         mActivatedPosition = position;
     }
 
-    private void postNewErrorToast(Handler h, final int stringResource) {
+    private void postNewErrorToast(Handler h, final String message) {
+        h.post(new Runnable() {
+            @Override
+            public void run() {
+                setListShown(true);
+                Toast.makeText(getActivity(), message,
+                        Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
+    private void postNewNothingFoundToast(Handler h, final int stringResource) {
         h.post(new Runnable() {
             @Override
             public void run() {
                 setListShown(true);
                 Toast.makeText(getActivity(), getString(stringResource),
-                        Toast.LENGTH_SHORT).show();
+                        Toast.LENGTH_LONG).show();
             }
         });
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
index 0c230a59b..677287afe 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/SearchEngine.java
@@ -27,6 +27,12 @@ import java.util.Vector;
 
 @SuppressWarnings("ALL")
 public interface SearchEngine {
+    public class NothingFoundException extends ExtractionException {
+        public NothingFoundException(String message) {
+            super(message);
+        }
+    }
+
     ArrayList<String> suggestionList(String query,String contentCountry, Downloader dl)
             throws ExtractionException, IOException;
 
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java b/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
index 4aac7aaf1..887b94564 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
@@ -28,11 +28,12 @@ public class SearchResult {
     public static SearchResult getSearchResult(SearchEngine engine, String query,
                                                int page, String languageCode, Downloader dl)
             throws ExtractionException, IOException {
-        try {
-            return engine.search(query, page, languageCode, dl).getSearchResult();
-        } catch (Exception e) {
-            throw new ExtractionException("Could not get any search result", e);
+
+        SearchResult result = engine.search(query, page, languageCode, dl).getSearchResult();
+        if(result.resultList.isEmpty()) {
+            throw new ExtractionException("Empty result despite no error");
         }
+        return result;
     }
 
     public String suggestion = "";
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index 6afed94eb..648cbd749 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -7,6 +7,7 @@ import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.schabi.newpipe.extractor.Downloader;
+import org.schabi.newpipe.extractor.ExtractionException;
 import org.schabi.newpipe.extractor.Parser;
 import org.schabi.newpipe.extractor.ParsingException;
 import org.schabi.newpipe.extractor.SearchEngine;
@@ -52,7 +53,7 @@ public class YoutubeSearchEngine implements SearchEngine {
 
     @Override
     public StreamPreviewInfoCollector search(String query, int page, String languageCode, Downloader downloader)
-            throws IOException, ParsingException {
+            throws IOException, ExtractionException {
         StreamPreviewInfoCollector collector = new StreamPreviewInfoCollector(
                 new YoutubeStreamUrlIdHandler());
         Uri.Builder builder = new Uri.Builder();
@@ -98,7 +99,7 @@ public class YoutubeSearchEngine implements SearchEngine {
                 // search message item
             } else if (!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
                 //result.errorMessage = el.text();
-                throw new StreamExtractor.ContentNotAvailableException(el.text());
+                throw new NothingFoundException(el.text());
 
                 // video item type
             } else if (!((el = item.select("div[class*=\"yt-lockup-video\"").first()) == null)) {
@@ -211,8 +212,6 @@ public class YoutubeSearchEngine implements SearchEngine {
 
             @Override
             public long getViewCount() throws ParsingException {
-                throw new ParsingException("blabla");
-                /*
                 String output;
                 String input = item.select("div[class=\"yt-lockup-meta\"]").first()
                         .select("li").get(1)
@@ -222,11 +221,16 @@ public class YoutubeSearchEngine implements SearchEngine {
                         .replace(".", "")
                         .replace(",", "");
 
-                if(Long.parseLong(output) == 30) {
-                    Log.d(TAG, "bla");
+                try {
+                    return Long.parseLong(output);
+                } catch (NumberFormatException e) {
+                    // if this happens the video probably has no views
+                    if(!input.isEmpty()) {
+                        return 0;
+                    } else {
+                        throw new ParsingException("Could not handle input: " + input, e);
+                    }
                 }
-                return Long.parseLong(output);
-                */
             }
 
             @Override
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbaa45111..d91841c66 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
     <string name="download">Download</string>
     <string name="search">Search</string>
     <string name="settings">Settings</string>
-    <string name="did_you_mean">Did you mean: </string>
+    <string name="did_you_mean">Did you mean: %1$s ?</string>
     <string name="search_page">Search page: </string>
     <string name="share_dialog_title">Share with:</string>
     <string name="choose_browser">Choose browser:</string>

From f90a1ede70928c4c9b8ad418eea137a27deee606 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 21:06:00 +0100
Subject: [PATCH 17/22] fixed some more bugs

---
 .../java/org/schabi/newpipe/VideoItemListFragment.java     | 2 ++
 .../java/org/schabi/newpipe/extractor/SearchResult.java    | 7 ++++++-
 .../extractor/services/youtube/YoutubeSearchEngine.java    | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index fc20aadb9..a02255447 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -151,6 +151,8 @@ public class VideoItemListFragment extends ListFragment {
                         /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.general_error));
 
                 e.printStackTrace();
+            } finally {
+
             }
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java b/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
index 887b94564..d21e2ba62 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/SearchResult.java
@@ -31,7 +31,12 @@ public class SearchResult {
 
         SearchResult result = engine.search(query, page, languageCode, dl).getSearchResult();
         if(result.resultList.isEmpty()) {
-            throw new ExtractionException("Empty result despite no error");
+            if(result.suggestion.isEmpty()) {
+                throw new ExtractionException("Empty result despite no error");
+            } else {
+                // This is used as a fallback. Do not relay on it !!!
+                throw new SearchEngine.NothingFoundException(result.suggestion);
+            }
         }
         return result;
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index 648cbd749..fe2dc30a7 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -96,6 +96,9 @@ public class YoutubeSearchEngine implements SearchEngine {
             // both types of spell correction item
             if (!((el = item.select("div[class*=\"spell-correction\"]").first()) == null)) {
                 collector.setSuggestion(el.select("a").first().text());
+                if(list.children().size() == 1) {
+                    throw new NothingFoundException("Did you mean: " + el.select("a").first().text());
+                }
                 // search message item
             } else if (!((el = item.select("div[class*=\"search-message\"]").first()) == null)) {
                 //result.errorMessage = el.text();

From 3c93c4714e9de730e55a022851d93044891d2f68 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 21:13:02 +0100
Subject: [PATCH 18/22] fixed crash during crash report

---
 app/src/main/java/org/schabi/newpipe/ErrorActivity.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index 5c34fbced..6223b34da 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -187,7 +187,12 @@ public class ErrorActivity extends AppCompatActivity {
         globIpRangeThread = new Thread(new IpRagneRequester());
         globIpRangeThread.start();
 
-        errorMessageView.setText(errorInfo.message);
+        if(errorInfo.message != 0) {
+            errorMessageView.setText(errorInfo.message);
+        } else {
+            errorMessageView.setVisibility(View.GONE);
+            findViewById(R.id.messageWhatHappenedView).setVisibility(View.GONE);
+        }
     }
 
     @Override

From 1210ab0de0f3ef2382e810a158021df8fbf0ce6f Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Mon, 29 Feb 2016 21:21:15 +0100
Subject: [PATCH 19/22] changed color of snackbar action text

---
 app/src/main/java/org/schabi/newpipe/ErrorActivity.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index 6223b34da..c460a64dd 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -5,6 +5,7 @@ package org.schabi.newpipe;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -99,6 +100,7 @@ public class ErrorActivity extends AppCompatActivity {
 
         if (rootView != null) {
             Snackbar.make(rootView, R.string.error_snackbar_message, Snackbar.LENGTH_LONG)
+                    .setActionTextColor(Color.YELLOW)
                     .setAction(R.string.error_snackbar_action, new View.OnClickListener() {
                         @Override
                         public void onClick(View v) {

From 77b94577072e12aed0a496365034d7844642a103 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 1 Mar 2016 18:43:36 +0100
Subject: [PATCH 20/22] add error handling to suggestions

---
 .../org/schabi/newpipe/ErrorActivity.java     |  9 +++-
 .../schabi/newpipe/VideoItemListActivity.java |  8 +++-
 .../schabi/newpipe/VideoItemListFragment.java |  2 -
 .../newpipe/extractor/ParsingException.java   |  3 --
 .../newpipe/extractor/StreamExtractor.java    |  3 --
 .../services/youtube/YoutubeSearchEngine.java | 47 +++++++++----------
 .../youtube/YoutubeStreamExtractor.java       |  7 +--
 7 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
index c460a64dd..0de0cdabb 100644
--- a/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/ErrorActivity.java
@@ -76,8 +76,11 @@ public class ErrorActivity extends AppCompatActivity {
     public static final String TAG = ErrorActivity.class.toString();
     public static final int SEARCHED = 0;
     public static final int REQUESTED_STREAM = 1;
-    public static final String SEARCHED_STRING = "Searched";
-    public static final String REQUESTED_STREAM_STRING = "Requested Stream";
+    public static final int GET_SUGGESTIONS = 2;
+    public static final String SEARCHED_STRING = "searched";
+    public static final String REQUESTED_STREAM_STRING = "requested stream";
+    public static final String GET_SUGGESTIONS_STRING = "get suggestions";
+
     public static final String ERROR_EMAIL_ADDRESS = "crashreport@newpipe.schabi.org";
     public static final String ERROR_EMAIL_SUBJECT = "Exception in NewPipe " + BuildConfig.VERSION_NAME;
 
@@ -303,6 +306,8 @@ public class ErrorActivity extends AppCompatActivity {
                 return REQUESTED_STREAM_STRING;
             case SEARCHED:
                 return SEARCHED_STRING;
+            case GET_SUGGESTIONS:
+                return GET_SUGGESTIONS_STRING;
             default:
                 return "Your description is in another castle.";
         }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
index 45e4e09cc..533c69e85 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListActivity.java
@@ -172,11 +172,17 @@ public class VideoItemListActivity extends AppCompatActivity
                 ArrayList<String>suggestions = engine.suggestionList(query,searchLanguage,new Downloader());
                 h.post(new SuggestionResultRunnable(suggestions));
             } catch (ExtractionException e) {
-                postNewErrorToast(h, R.string.parsing_error);
+                ErrorActivity.reportError(h, VideoItemListActivity.this, e, null, findViewById(R.id.videoitem_list),
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.parsing_error));
                 e.printStackTrace();
             } catch (IOException e) {
                 postNewErrorToast(h, R.string.network_error);
                 e.printStackTrace();
+            } catch (Exception e) {
+                ErrorActivity.reportError(h, VideoItemListActivity.this, e, null, findViewById(R.id.videoitem_list),
+                        ErrorActivity.ErrorInfo.make(ErrorActivity.SEARCHED,
+                        /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.general_error));
             }
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index a02255447..fc20aadb9 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -151,8 +151,6 @@ public class VideoItemListFragment extends ListFragment {
                         /* todo: this shoudl not be assigned static */ "Youtube", query, R.string.general_error));
 
                 e.printStackTrace();
-            } finally {
-
             }
         }
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java b/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
index 64951bf49..5803537bb 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/ParsingException.java
@@ -25,9 +25,6 @@ public class ParsingException extends ExtractionException {
     public ParsingException(String message) {
         super(message);
     }
-    public ParsingException(Throwable cause) {
-        super(cause);
-    }
     public ParsingException(String message, Throwable cause) {
         super(message, cause);
     }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
index 4fb396e1f..b1f0249fb 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/StreamExtractor.java
@@ -44,9 +44,6 @@ public interface StreamExtractor {
         public ContentNotAvailableException(String message) {
             super(message);
         }
-        public ContentNotAvailableException(Throwable cause) {
-            super(cause);
-        }
         public ContentNotAvailableException(String message, Throwable cause) {
             super(message, cause);
         }
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
index fe2dc30a7..4e6010108 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
@@ -137,39 +137,34 @@ public class YoutubeSearchEngine implements SearchEngine {
 
         String response = dl.download(url);
 
+        //TODO: Parse xml data using Jsoup not done
+        DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
+        DocumentBuilder dBuilder;
+        org.w3c.dom.Document doc = null;
+
         try {
+            dBuilder = dbFactory.newDocumentBuilder();
+            doc = dBuilder.parse(new InputSource(
+                    new ByteArrayInputStream(response.getBytes("utf-8"))));
+            doc.getDocumentElement().normalize();
+        } catch (ParserConfigurationException | SAXException | IOException e) {
+            throw new ParsingException("Could not parse document.");
+        }
 
-            //TODO: Parse xml data using Jsoup not done
-            DocumentBuilderFactory dbFactory = DocumentBuilderFactory.newInstance();
-            DocumentBuilder dBuilder;
-            org.w3c.dom.Document doc = null;
+        try {
+            NodeList nList = doc.getElementsByTagName("CompleteSuggestion");
+            for (int temp = 0; temp < nList.getLength(); temp++) {
 
-            try {
-                dBuilder = dbFactory.newDocumentBuilder();
-                doc = dBuilder.parse(new InputSource(
-                        new ByteArrayInputStream(response.getBytes("utf-8"))));
-                doc.getDocumentElement().normalize();
-            } catch (ParserConfigurationException | SAXException | IOException e) {
-                e.printStackTrace();
-            }
-
-            if (doc != null) {
-                NodeList nList = doc.getElementsByTagName("CompleteSuggestion");
-                for (int temp = 0; temp < nList.getLength(); temp++) {
-
-                    NodeList nList1 = doc.getElementsByTagName("suggestion");
-                    Node nNode1 = nList1.item(temp);
-                    if (nNode1.getNodeType() == Node.ELEMENT_NODE) {
-                        org.w3c.dom.Element eElement = (org.w3c.dom.Element) nNode1;
-                        suggestions.add(eElement.getAttribute("data"));
-                    }
+                NodeList nList1 = doc.getElementsByTagName("suggestion");
+                Node nNode1 = nList1.item(temp);
+                if (nNode1.getNodeType() == Node.ELEMENT_NODE) {
+                    org.w3c.dom.Element eElement = (org.w3c.dom.Element) nNode1;
+                    suggestions.add(eElement.getAttribute("data"));
                 }
-            } else {
-                Log.e(TAG, "GREAT FUCKING ERROR");
             }
             return suggestions;
         } catch(Exception e) {
-            throw new ParsingException(e);
+            throw new ParsingException("Could not get suggestions form document.", e);
         }
     }
 
diff --git a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
index b2560fe39..db137a145 100644
--- a/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
+++ b/app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java
@@ -52,9 +52,6 @@ public class YoutubeStreamExtractor implements StreamExtractor {
     // exceptions
 
     public class DecryptException extends ParsingException {
-        DecryptException(Throwable cause) {
-            super(cause);
-        }
         DecryptException(String message, Throwable cause) {
             super(message, cause);
         }
@@ -718,7 +715,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
                 info.thumbnail_url = "https:" + info.thumbnail_url;
             }
         } catch (Exception e) {
-            throw new ParsingException(e);
+            throw new ParsingException("Could not get video preview info", e);
         }
         return info;
     }
@@ -772,7 +769,7 @@ public class YoutubeStreamExtractor implements StreamExtractor {
             Function decryptionFunc = (Function) scope.get("decrypt", scope);
             result = decryptionFunc.call(context, scope, scope, new Object[]{encryptedSig});
         } catch (Exception e) {
-            throw new DecryptException(e);
+            throw new DecryptException("could not get decrypt signature", e);
         } finally {
             Context.exit();
         }

From 781bf8e7ec41a51352975a786baf2b6cfab29074 Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 1 Mar 2016 23:28:22 +0100
Subject: [PATCH 21/22] fixed yet another bug

---
 .../schabi/newpipe/VideoItemDetailFragment.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
index d5d6ff052..1a35a4d38 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemDetailFragment.java
@@ -238,12 +238,15 @@ public class VideoItemDetailFragment extends Fragment {
         }
         @Override
         public void run() {
-            boolean show_age_restricted_content = PreferenceManager.getDefaultSharedPreferences(getActivity())
-                    .getBoolean(activity.getString(R.string.show_age_restricted_content), false);
-            if(streamInfo.age_limit == 0 || show_age_restricted_content) {
-                updateInfo(streamInfo);
-            } else {
-                onNotSpecifiedContentErrorWithMessage(R.string.video_is_age_restricted);
+            Activity a = getActivity();
+            if(a != null) {
+                boolean show_age_restricted_content = PreferenceManager.getDefaultSharedPreferences(a)
+                        .getBoolean(activity.getString(R.string.show_age_restricted_content), false);
+                if (streamInfo.age_limit == 0 || show_age_restricted_content) {
+                    updateInfo(streamInfo);
+                } else {
+                    onNotSpecifiedContentErrorWithMessage(R.string.video_is_age_restricted);
+                }
             }
         }
     }

From 97d76aee18177f6e18569559b664305b36ff401d Mon Sep 17 00:00:00 2001
From: Christian Schabesberger <chris.schabesberger@mailbox.org>
Date: Tue, 1 Mar 2016 23:54:26 +0100
Subject: [PATCH 22/22] fixed failing unit test

---
 .../extractor/youtube/YoutubeSearchEngineTest.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
index 6c3540754..70e955d7d 100644
--- a/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
+++ b/app/src/androidTest/java/org/schabi/newpipe/extractor/youtube/YoutubeSearchEngineTest.java
@@ -2,6 +2,8 @@ package org.schabi.newpipe.extractor.youtube;
 
 import android.test.AndroidTestCase;
 
+import org.apache.commons.lang.exception.ExceptionUtils;
+import org.schabi.newpipe.extractor.SearchResult;
 import org.schabi.newpipe.extractor.StreamPreviewInfo;
 import org.schabi.newpipe.extractor.SearchEngine;
 import org.schabi.newpipe.extractor.services.youtube.YoutubeSearchEngine;
@@ -30,7 +32,7 @@ import java.util.ArrayList;
  */
 
 public class YoutubeSearchEngineTest extends AndroidTestCase {
-    private SearchEngine.Result result;
+    private SearchResult result;
     private ArrayList<String> suggestionReply;
 
     @Override
@@ -39,12 +41,13 @@ public class YoutubeSearchEngineTest extends AndroidTestCase {
         SearchEngine engine = new YoutubeSearchEngine();
 
         result = engine.search("bla",
-                0, "de", new Downloader());
+                0, "de", new Downloader()).getSearchResult();
         suggestionReply = engine.suggestionList("hello","de",new Downloader());
     }
 
     public void testIfNoErrorOccur() {
-        assertEquals(result.errorMessage, "");
+        assertTrue(result.errors.isEmpty() ? "" : ExceptionUtils.getStackTrace(result.errors.get(0))
+                ,result.errors.isEmpty());
     }
 
     public void testIfListIsNotEmpty() {