move on to version v0.13.5

Downloader: Fix crash on loading unfinished downloads from .giga files (Fixup for release builds)

.github/CONTRIBUTING.md

@@ -28,7 +28,7 @@ Do not report crashes in the GitHub issue tracker. NewPipe has an automated cras
 * Stick to NewPipe's style conventions (well, just look the other code and then do it the same way :))
 * Do not bring non-free software (e.g., binary blobs) into the project. Also, make sure you do not introduce Google libraries.
 * Stick to [F-Droid contribution guidelines](https://f-droid.org/wiki/page/Inclusion_Policy)
-* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform.
+* Make changes on a separate branch, not on the master branch. This is commonly known as *feature branch workflow*. You may then send your changes as a pull request on GitHub. Patches to the email address mentioned in this document might not be considered, GitHub is the primary platform. (This only affects you if you are a member of TeamNewPipe)
 * When submitting changes, you confirm that your code is licensed under the terms of the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.html).
 * Please test (compile and run) your code before you submit changes! Ideally, provide test feedback in the PR description. Untested code will **not** be merged!
 * Try to figure out yourself why builds on our CI fail.

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 62
+        versionCode 64
-        versionName "0.13.3"
+        versionName "0.13.5"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

app/proguard-rules.pro

@@ -42,3 +42,9 @@
 -dontwarn javax.annotation.**
 # A resource is loaded with a relative path so the package of this class must be preserved.
 -keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    !static !transient <fields>;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+}

app/src/main/java/org/schabi/newpipe/about/AboutActivity.java

@@ -128,47 +128,31 @@ public class AboutActivity extends AppCompatActivity {
         public View onCreateView(LayoutInflater inflater, ViewGroup container,
                                  Bundle savedInstanceState) {
             View rootView = inflater.inflate(R.layout.fragment_about, container, false);
+            Context context = this.getContext();
+
             TextView version = rootView.findViewById(R.id.app_version);
             version.setText(BuildConfig.VERSION_NAME);
 
             View githubLink = rootView.findViewById(R.id.github_link);
-            githubLink.setOnClickListener(new OnGithubLinkClickListener());
+            githubLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.github_url), context));
 
             View donationLink = rootView.findViewById(R.id.donation_link);
-            donationLink.setOnClickListener(new OnDonationLinkClickListener());
+            donationLink.setOnClickListener(v -> openWebsite(context.getString(R.string.donation_url), context));
 
             View websiteLink = rootView.findViewById(R.id.website_link);
-            websiteLink.setOnClickListener(new OnWebsiteLinkClickListener());
+            websiteLink.setOnClickListener(nv -> openWebsite(context.getString(R.string.website_url), context));
+
+            View privacyPolicyLink = rootView.findViewById(R.id.privacy_policy_link);
+            privacyPolicyLink.setOnClickListener(v -> openWebsite(context.getString(R.string.privacy_policy_url), context));
 
             return rootView;
         }
 
-        private static class OnGithubLinkClickListener implements View.OnClickListener {
+        private void openWebsite(String url, Context context) {
-            @Override
+            Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
-            public void onClick(final View view) {
+            context.startActivity(intent);
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.github_url)));
-                context.startActivity(intent);
-            }
         }
 
-        private static class OnDonationLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.donation_url)));
-                context.startActivity(intent);
-            }
-        }
-
-        private static class OnWebsiteLinkClickListener implements View.OnClickListener {
-            @Override
-            public void onClick(final View view) {
-                final Context context = view.getContext();
-                Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(context.getString(R.string.website_url)));
-                context.startActivity(intent);
-            }
-        }
     }
 
 

app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java

@@ -1,5 +1,6 @@
 package org.schabi.newpipe.about;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -39,7 +40,7 @@ public class LicenseFragment extends Fragment {
      * @param license the license to show
      */
     public static void showLicense(Context context, License license) {
-        new LicenseFragmentHelper().execute(context, license);
+        new LicenseFragmentHelper((Activity) context).execute(license);
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java

@@ -1,8 +1,11 @@
 package org.schabi.newpipe.about;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
 import org.schabi.newpipe.R;
@@ -10,26 +13,46 @@ import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;
 
 public class LicenseFragmentHelper extends AsyncTask<Object, Void, Integer> {
 
-    private Context context;
+    WeakReference<Activity> weakReference;
     private License license;
 
+    public LicenseFragmentHelper(@Nullable Activity activity) {
+        weakReference = new WeakReference<>(activity);
+    }
+
+    @Nullable
+    private Activity getActivity() {
+        Activity activity = weakReference.get();
+
+        if (activity != null && activity.isFinishing()) {
+            return null;
+        } else {
+            return activity;
+        }
+    }
+
     @Override
     protected Integer doInBackground(Object... objects) {
-        context = (Context) objects[0];
+        license = (License) objects[0];
-        license = (License) objects[1];
         return 1;
     }
 
     @Override
-    protected void onPostExecute(Integer result){
+    protected void onPostExecute(Integer result) {
-        String webViewData = getFormattedLicense(context, license);
+        Activity activity = getActivity();
-        AlertDialog.Builder alert = new AlertDialog.Builder(context);
+        if (activity == null) {
+            return;
+        }
+
+        String webViewData = getFormattedLicense(activity, license);
+        AlertDialog.Builder alert = new AlertDialog.Builder(activity);
         alert.setTitle(license.getName());
 
-        WebView wv = new WebView(context);
+        WebView wv = new WebView(activity);
         wv.loadData(webViewData, "text/html; charset=UTF-8", null);
 
         alert.setView(wv);

app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java

@@ -77,8 +77,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
         UrlIdHandler kioskTypeUrlIdHandler = service.getKioskList()
                 .getUrlIdHandlerByType(kioskId);
         instance.setInitialData(serviceId,
-                kioskTypeUrlIdHandler.getUrl(kioskId),
+                kioskTypeUrlIdHandler.getUrl(kioskId), kioskId);
-                kioskId);
         instance.kioskId = kioskId;
         return instance;
     }

app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java

@@ -17,6 +17,7 @@ import org.schabi.newpipe.info_list.holder.PlaylistInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder;
 import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.OnClickGesture;
 
 import java.util.ArrayList;
@@ -238,7 +239,7 @@ public class InfoListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolde
                 return new PlaylistInfoItemHolder(infoItemBuilder, parent);
             default:
                 Log.e(TAG, "Trollolo");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
         }
     }
 

app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java

@@ -14,6 +14,7 @@ import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder;
 import org.schabi.newpipe.local.holder.LocalPlaylistStreamItemHolder;
 import org.schabi.newpipe.local.holder.LocalStatisticStreamItemHolder;
 import org.schabi.newpipe.local.holder.RemotePlaylistItemHolder;
+import org.schabi.newpipe.util.FallbackViewHolder;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.OnClickGesture;
 
@@ -225,7 +226,7 @@ public class LocalItemListAdapter extends RecyclerView.Adapter<RecyclerView.View
                 return new LocalStatisticStreamItemHolder(localItemBuilder, parent);
             default:
                 Log.e(TAG, "No view type has been considered for holder: [" + type + "]");
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
         }
     }
 

app/src/main/java/org/schabi/newpipe/player/BasePlayer.java

@@ -271,6 +271,7 @@ public abstract class BasePlayer implements
         if (audioReactor != null) audioReactor.dispose();
         if (playbackManager != null) playbackManager.dispose();
         if (databaseUpdateReactor != null) databaseUpdateReactor.dispose();
+        if (mediaSessionManager != null) mediaSessionManager.dispose();
 
         if (playQueueAdapter != null) {
             playQueueAdapter.unsetSelectedListener();

app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java

@@ -25,6 +25,7 @@ import android.content.SharedPreferences;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
 import android.media.AudioManager;
 import android.os.Build;
 import android.os.Bundle;
@@ -114,9 +115,14 @@ public final class MainVideoPlayer extends AppCompatActivity
         if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]");
         defaultPreferences = PreferenceManager.getDefaultSharedPreferences(this);
         ThemeHelper.setTheme(this);
+        getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) getWindow().setStatusBarColor(Color.BLACK);
         setVolumeControlStream(AudioManager.STREAM_MUSIC);
 
+        WindowManager.LayoutParams lp = getWindow().getAttributes();
+        lp.screenBrightness = PlayerHelper.getScreenBrightness(getApplicationContext());
+        getWindow().setAttributes(lp);
+
         hideSystemUi();
         setContentView(R.layout.activity_main_player);
         playerImpl = new VideoPlayerImpl(this);
@@ -203,6 +209,9 @@ public final class MainVideoPlayer extends AppCompatActivity
         if (DEBUG) Log.d(TAG, "onStop() called");
         super.onStop();
         playerImpl.destroy();
+
+        PlayerHelper.setScreenBrightness(getApplicationContext(),
+                getWindow().getAttributes().screenBrightness);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -645,7 +654,7 @@ public final class MainVideoPlayer extends AppCompatActivity
         @Override
         protected int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
                                                  final String playbackQuality) {
-            return ListHelper.getDefaultResolutionIndex(context, sortedVideos, playbackQuality);
+            return ListHelper.getResolutionIndex(context, sortedVideos, playbackQuality);
         }
 
         /*//////////////////////////////////////////////////////////////////////////
@@ -882,7 +891,9 @@ public final class MainVideoPlayer extends AppCompatActivity
         private final boolean isPlayerGestureEnabled = PlayerHelper.isPlayerGestureEnabled(getApplicationContext());
 
         private final float stepsBrightness = 15, stepBrightness = (1f / stepsBrightness), minBrightness = .01f;
-        private float currentBrightness = .5f;
+        private float currentBrightness = getWindow().getAttributes().screenBrightness > 0
+                ? getWindow().getAttributes().screenBrightness
+                : 0.5f;
 
         private int currentVolume, maxVolume = playerImpl.getAudioReactor().getMaxVolume();
         private final float stepsVolume = 15, stepVolume = (float) Math.ceil(maxVolume / stepsVolume), minVolume = 0;

app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java

@@ -517,7 +517,7 @@ public final class PopupVideoPlayer extends Service {
         @Override
         protected int getOverrideResolutionIndex(final List<VideoStream> sortedVideos,
                                                  final String playbackQuality) {
-            return ListHelper.getPopupDefaultResolutionIndex(context, sortedVideos, playbackQuality);
+            return ListHelper.getPopupResolutionIndex(context, sortedVideos, playbackQuality);
         }
 
         /*//////////////////////////////////////////////////////////////////////////

app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java

@@ -11,7 +11,6 @@ import android.view.KeyEvent;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
 
-import org.schabi.newpipe.player.mediasession.DummyPlaybackPreparer;
 import org.schabi.newpipe.player.mediasession.MediaSessionCallback;
 import org.schabi.newpipe.player.mediasession.PlayQueueNavigator;
 import org.schabi.newpipe.player.mediasession.PlayQueuePlaybackController;
@@ -26,10 +25,12 @@ public class MediaSessionManager {
                                @NonNull final Player player,
                                @NonNull final MediaSessionCallback callback) {
         this.mediaSession = new MediaSessionCompat(context, TAG);
+        this.mediaSession.setActive(true);
+
         this.sessionConnector = new MediaSessionConnector(mediaSession,
                 new PlayQueuePlaybackController(callback));
         this.sessionConnector.setQueueNavigator(new PlayQueueNavigator(mediaSession, callback));
-        this.sessionConnector.setPlayer(player, new DummyPlaybackPreparer());
+        this.sessionConnector.setPlayer(player, null);
     }
 
     @Nullable
@@ -37,4 +38,11 @@ public class MediaSessionManager {
     public KeyEvent handleMediaButtonIntent(final Intent intent) {
         return MediaButtonReceiver.handleIntent(mediaSession, intent);
     }
+
+    public void dispose() {
+        this.sessionConnector.setPlayer(null, null);
+        this.sessionConnector.setQueueNavigator(null);
+        this.mediaSession.setActive(false);
+        this.mediaSession.release();
+    }
 }

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -9,9 +9,9 @@ import android.support.annotation.Nullable;
 import android.view.accessibility.CaptioningManager;
 
 import com.google.android.exoplayer2.SeekParameters;
+import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -37,6 +37,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FILL;
 import static com.google.android.exoplayer2.ui.AspectRatioFrameLayout.RESIZE_MODE_FIT;
@@ -260,6 +261,16 @@ public class PlayerHelper {
 
         return captioningManager.getFontScale();
     }
+
+    public static float getScreenBrightness(@NonNull final Context context) {
+        //a value of less than 0, the default, means to use the preferred screen brightness
+        return getScreenBrightness(context, -1);
+    }
+
+    public static void setScreenBrightness(@NonNull final Context context, final float setScreenBrightness) {
+        setScreenBrightness(context, setScreenBrightness, System.currentTimeMillis());
+    }
+
     ////////////////////////////////////////////////////////////////////////////
     // Private helpers
     ////////////////////////////////////////////////////////////////////////////
@@ -292,4 +303,23 @@ public class PlayerHelper {
     private static boolean isAutoQueueEnabled(@NonNull final Context context, final boolean b) {
         return getPreferences(context).getBoolean(context.getString(R.string.auto_queue_key), b);
     }
+
+    private static void setScreenBrightness(@NonNull final Context context, final float screenBrightness, final long timestamp) {
+        SharedPreferences.Editor editor = getPreferences(context).edit();
+        editor.putFloat(context.getString(R.string.screen_brightness_key), screenBrightness);
+        editor.putLong(context.getString(R.string.screen_brightness_timestamp_key), timestamp);
+        editor.apply();
+    }
+
+    private static float getScreenBrightness(@NonNull final Context context, final float screenBrightness) {
+        SharedPreferences sp = getPreferences(context);
+        long timestamp = sp.getLong(context.getString(R.string.screen_brightness_timestamp_key), 0);
+        // hypothesis: 4h covers a viewing block, eg evening. External lightning conditions will change in the next
+        // viewing block so we fall back to the default brightness
+        if ((System.currentTimeMillis() - timestamp) > TimeUnit.HOURS.toMillis(4)) {
+            return screenBrightness;
+        } else {
+            return sp.getFloat(context.getString(R.string.screen_brightness_key), screenBrightness);
+        }
+    }
 }

app/src/main/java/org/schabi/newpipe/player/mediasession/DummyPlaybackPreparer.java

@@ -1,45 +0,0 @@
-package org.schabi.newpipe.player.mediasession;
-
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.ResultReceiver;
-
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector;
-
-public class DummyPlaybackPreparer implements MediaSessionConnector.PlaybackPreparer {
-    @Override
-    public long getSupportedPrepareActions() {
-        return 0;
-    }
-
-    @Override
-    public void onPrepare() {
-
-    }
-
-    @Override
-    public void onPrepareFromMediaId(String mediaId, Bundle extras) {
-
-    }
-
-    @Override
-    public void onPrepareFromSearch(String query, Bundle extras) {
-
-    }
-
-    @Override
-    public void onPrepareFromUri(Uri uri, Bundle extras) {
-
-    }
-
-    @Override
-    public String[] getCommands() {
-        return new String[0];
-    }
-
-    @Override
-    public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
-
-    }
-}

app/src/main/java/org/schabi/newpipe/player/mediasession/MediaSessionCallback.java

@@ -13,5 +13,4 @@ public interface MediaSessionCallback {
 
     void onPlay();
     void onPause();
-    void onSetShuffle(final boolean isShuffled);
 }

app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java

@@ -1,7 +1,5 @@
 package org.schabi.newpipe.player.mediasession;
 
-import android.support.v4.media.session.PlaybackStateCompat;
-
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.ext.mediasession.DefaultPlaybackController;
 
@@ -22,10 +20,4 @@ public class PlayQueuePlaybackController extends DefaultPlaybackController {
     public void onPause(Player player) {
         callback.onPause();
     }
-
-    @Override
-    public void onSetShuffleMode(Player player, int shuffleMode) {
-        callback.onSetShuffle(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL
-                || shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_GROUP);
-    }
 }

app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java

@@ -69,9 +69,4 @@ public class BasePlayerMediaSession implements MediaSessionCallback {
     public void onPause() {
         player.onPause();
     }
-
-    @Override
-    public void onSetShuffle(boolean isShuffled) {
-        player.onShuffleModeEnabledChanged(isShuffled);
-    }
 }

app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java

@@ -14,6 +14,7 @@ import org.schabi.newpipe.player.playqueue.events.MoveEvent;
 import org.schabi.newpipe.player.playqueue.events.PlayQueueEvent;
 import org.schabi.newpipe.player.playqueue.events.RemoveEvent;
 import org.schabi.newpipe.player.playqueue.events.SelectEvent;
+import org.schabi.newpipe.util.FallbackViewHolder;
 
 import java.util.List;
 
@@ -188,7 +189,7 @@ public class PlayQueueAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
                 return new PlayQueueItemHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.play_queue_item, parent, false));
             default:
                 Log.e(TAG, "Attempting to create view holder with undefined type: " + type);
-                return null;
+                return new FallbackViewHolder(new View(parent.getContext()));
         }
     }
 

app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java

@@ -1,7 +1,9 @@
 package org.schabi.newpipe.report;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.net.Uri;
@@ -33,10 +35,8 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.schabi.newpipe.ActivityCommunicator;
 import org.schabi.newpipe.BuildConfig;
-import org.schabi.newpipe.Downloader;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.R;
-import org.schabi.newpipe.extractor.utils.Parser;
 import org.schabi.newpipe.util.ThemeHelper;
 
 import java.io.PrintWriter;
@@ -44,9 +44,9 @@ import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.TimeZone;
 import java.util.Vector;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /*
  * Created by Christian Schabesberger on 24.10.15.
@@ -210,12 +210,31 @@ public class ErrorActivity extends AppCompatActivity {
         currentTimeStamp = getCurrentTimeStamp();
 
         reportButton.setOnClickListener((View v) -> {
-            Intent i = new Intent(Intent.ACTION_SENDTO);
+            Context context = this;
-            i.setData(Uri.parse("mailto:" + ERROR_EMAIL_ADDRESS))
+            new AlertDialog.Builder(context)
-                    .putExtra(Intent.EXTRA_SUBJECT, ERROR_EMAIL_SUBJECT)
+                    .setIcon(android.R.drawable.ic_dialog_alert)
-                    .putExtra(Intent.EXTRA_TEXT, buildJson());
+                    .setTitle(R.string.privacy_policy_title)
+                    .setMessage(R.string.start_accept_privacy_policy)
+                    .setCancelable(false)
+                    .setNeutralButton(R.string.read_privacy_policy, (dialog, which) -> {
+                        Intent webIntent = new Intent(Intent.ACTION_VIEW,
+                                Uri.parse(context.getString(R.string.privacy_policy_url))
+                        );
+                        context.startActivity(webIntent);
+                    })
+                    .setPositiveButton(R.string.accept, (dialog, which) -> {
+                        Intent i = new Intent(Intent.ACTION_SENDTO);
+                        i.setData(Uri.parse("mailto:" + ERROR_EMAIL_ADDRESS))
+                                .putExtra(Intent.EXTRA_SUBJECT, ERROR_EMAIL_SUBJECT)
+                                .putExtra(Intent.EXTRA_TEXT, buildJson());
+
+                        startActivity(Intent.createChooser(i, "Send Email"));
+                    })
+                    .setNegativeButton(R.string.decline, (dialog, which) -> {
+                        // do nothing
+                    })
+                    .show();
 
-            startActivity(Intent.createChooser(i, "Send Email"));
         });
 
         // normal bugreport

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

@@ -4,7 +4,9 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.preference.ListPreference;
@@ -30,15 +32,21 @@ import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
+import java.util.Map;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 
+import static android.content.Context.MODE_PRIVATE;
+
 public class ContentSettingsFragment extends BasePreferenceFragment {
 
     private static final int REQUEST_IMPORT_PATH = 8945;
@@ -48,6 +56,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     private File databasesDir;
     private File newpipe_db;
     private File newpipe_db_journal;
+    private File newpipe_settings;
 
     private String thumbnailLoadToggleKey;
 
@@ -79,6 +88,8 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
         databasesDir = new File(homeDir + "/databases");
         newpipe_db = new File(homeDir + "/databases/newpipe.db");
         newpipe_db_journal = new File(homeDir + "/databases/newpipe.db-journal");
+        newpipe_settings = new File(homeDir + "/databases/newpipe.settings");
+        newpipe_settings.delete();
 
         addPreferencesFromResource(R.xml.content_settings);
 
@@ -174,19 +185,19 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
         if ((requestCode == REQUEST_IMPORT_PATH || requestCode == REQUEST_EXPORT_PATH)
                 && resultCode == Activity.RESULT_OK && data.getData() != null) {
-                String path = Utils.getFileForUri(data.getData()).getAbsolutePath();
+            String path = Utils.getFileForUri(data.getData()).getAbsolutePath();
-                if (requestCode == REQUEST_EXPORT_PATH) {
+            if (requestCode == REQUEST_EXPORT_PATH) {
-                    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
-                    exportDatabase(path + "/NewPipeData-" + sdf.format(new Date()) + ".zip");
+                exportDatabase(path + "/NewPipeData-" + sdf.format(new Date()) + ".zip");
-                } else {
+            } else {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-                    builder.setMessage(R.string.override_current_data)
+                builder.setMessage(R.string.override_current_data)
-                            .setPositiveButton(android.R.string.ok,
+                        .setPositiveButton(android.R.string.ok,
-                                    (DialogInterface d, int id) -> importDatabase(path))
+                                (DialogInterface d, int id) -> importDatabase(path))
-                            .setNegativeButton(android.R.string.cancel,
+                        .setNegativeButton(android.R.string.cancel,
-                                    (DialogInterface d, int id) -> d.cancel());
+                                (DialogInterface d, int id) -> d.cancel());
-                    builder.create().show();
+                builder.create().show();
-                }
+            }
         }
     }
 
@@ -197,6 +208,8 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
                             new FileOutputStream(path)));
             ZipHelper.addFileToZip(outZip, newpipe_db.getPath(), "newpipe.db");
             ZipHelper.addFileToZip(outZip, newpipe_db_journal.getPath(), "newpipe.db-journal");
+            saveSharedPreferencesToFile(newpipe_settings);
+            ZipHelper.addFileToZip(outZip, newpipe_settings.getPath(), "newpipe.settings");
 
             outZip.close();
 
@@ -207,6 +220,29 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
         }
     }
 
+    private void saveSharedPreferencesToFile(File dst) {
+        ObjectOutputStream output = null;
+        try {
+            output = new ObjectOutputStream(new FileOutputStream(dst));
+            SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(getContext());
+            output.writeObject(pref.getAll());
+
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }finally {
+            try {
+                if (output != null) {
+                    output.flush();
+                    output.close();
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
     private void importDatabase(String filePath) {
         // check if file is supported
         ZipFile zipFile = null;
@@ -223,30 +259,83 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
         }
 
         try {
-            ZipInputStream zipIn = new ZipInputStream(
-                    new BufferedInputStream(
-                            new FileInputStream(filePath)));
-
             if (!databasesDir.exists() && !databasesDir.mkdir()) {
                 throw new Exception("Could not create databases dir");
             }
 
-            if(!(ZipHelper.extractFileFromZip(zipIn, newpipe_db.getPath(), "newpipe.db")
+            if(!(ZipHelper.extractFileFromZip(filePath, newpipe_db.getPath(), "newpipe.db")
-                && ZipHelper.extractFileFromZip(zipIn, newpipe_db_journal.getPath(), "newpipe.db-journal"))) {
+                    && ZipHelper.extractFileFromZip(filePath, newpipe_db_journal.getPath(), "newpipe.db-journal"))) {
-               Toast.makeText(getContext(), R.string.could_not_import_all_files, Toast.LENGTH_LONG)
+                Toast.makeText(getContext(), R.string.could_not_import_all_files, Toast.LENGTH_LONG)
-                       .show();
+                        .show();
             }
 
-            zipIn.close();
+            //If settings file exist, ask if it should be imported.
+            if(ZipHelper.extractFileFromZip(filePath, newpipe_settings.getPath(), "newpipe.settings")) {
+                AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+                alert.setTitle(R.string.import_settings);
+
+                alert.setNegativeButton(android.R.string.no, (dialog, which) -> {
+                    dialog.dismiss();
+                    // restart app to properly load db
+                    System.exit(0);
+                });
+                alert.setPositiveButton(android.R.string.yes, (dialog, which) -> {
+                    dialog.dismiss();
+                    loadSharedPreferences(newpipe_settings);
+                    // restart app to properly load db
+                    System.exit(0);
+                });
+                alert.show();
+            } else {
+                // restart app to properly load db
+                System.exit(0);
+            }
 
-            // restart app to properly load db
-            //App.restart(getContext());
-            System.exit(0);
         } catch (Exception e) {
             onError(e);
         }
     }
 
+    private void loadSharedPreferences(File src) {
+        ObjectInputStream input = null;
+        try {
+            input = new ObjectInputStream(new FileInputStream(src));
+            SharedPreferences.Editor prefEdit = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
+            prefEdit.clear();
+            Map<String, ?> entries = (Map<String, ?>) input.readObject();
+            for (Map.Entry<String, ?> entry : entries.entrySet()) {
+                Object v = entry.getValue();
+                String key = entry.getKey();
+
+                if (v instanceof Boolean)
+                    prefEdit.putBoolean(key, ((Boolean) v).booleanValue());
+                else if (v instanceof Float)
+                    prefEdit.putFloat(key, ((Float) v).floatValue());
+                else if (v instanceof Integer)
+                    prefEdit.putInt(key, ((Integer) v).intValue());
+                else if (v instanceof Long)
+                    prefEdit.putLong(key, ((Long) v).longValue());
+                else if (v instanceof String)
+                    prefEdit.putString(key, ((String) v));
+            }
+            prefEdit.commit();
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }finally {
+            try {
+                if (input != null) {
+                    input.close();
+                }
+            } catch (IOException ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
+
     @Override
     public void onResume() {
         super.onResume();

app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java

@@ -159,7 +159,7 @@ public class SelectChannelFragment extends DialogFragment {
 
             @Override
             public void onError(Throwable exception) {
-                onError(exception);
+                SelectChannelFragment.this.onError(exception);
             }
 
             @Override

app/src/main/java/org/schabi/newpipe/util/FallbackViewHolder.java

@@ -0,0 +1,10 @@
+package org.schabi.newpipe.util;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+
+public class FallbackViewHolder extends RecyclerView.ViewHolder {
+    public FallbackViewHolder(View itemView) {
+        super(itemView);
+    }
+}

app/src/main/java/org/schabi/newpipe/util/ZipHelper.java

@@ -62,7 +62,12 @@ public class ZipHelper {
      * @return will return true if the file was found within the zip file
      * @throws Exception
      */
-    public static boolean extractFileFromZip(ZipInputStream inZip, String file, String name) throws Exception {
+    public static boolean extractFileFromZip(String filePath, String file, String name) throws Exception {
+
+        ZipInputStream inZip = new ZipInputStream(
+                new BufferedInputStream(
+                        new FileInputStream(filePath)));
+
         byte data[] = new byte[BUFFER_SIZE];
 
         boolean found = false;
@@ -89,6 +94,6 @@ public class ZipHelper {
                 inZip.closeEntry();
             }
         }
-        return true;
+        return found;
     }
 }

app/src/main/java/us/shandian/giga/get/DownloadMission.java

@@ -5,6 +5,7 @@ import android.os.Looper;
 import android.util.Log;
 
 import java.io.File;
+import java.io.ObjectInputStream;
 import java.io.Serializable;
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -312,6 +313,13 @@ public class DownloadMission implements Serializable {
         }
     }
 
+    private void readObject(ObjectInputStream inputStream)
+    throws java.io.IOException, ClassNotFoundException
+    {
+        inputStream.defaultReadObject();
+        mListeners = new ArrayList<>();
+    }
+
     private void deleteThisFromFile() {
         new File(getMetaFilename()).delete();
     }

app/src/main/java/us/shandian/giga/get/DownloadRunnable.java

@@ -2,7 +2,6 @@ package us.shandian.giga.get;
 
 import android.util.Log;
 
-import java.io.BufferedInputStream;
 import java.io.RandomAccessFile;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -104,11 +103,11 @@ public class DownloadRunnable implements Runnable {
 
                 RandomAccessFile f = new RandomAccessFile(mMission.location + "/" + mMission.name, "rw");
                 f.seek(start);
-                BufferedInputStream ipt = new BufferedInputStream(conn.getInputStream());
+                java.io.InputStream ipt = conn.getInputStream();
-                byte[] buf = new byte[512];
+                byte[] buf = new byte[64*1024];
 
                 while (start < end && mMission.running) {
-                    int len = ipt.read(buf, 0, 512);
+                    int len = ipt.read(buf, 0, buf.length);
 
                     if (len == -1) {
                         break;

app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java

@@ -1,11 +1,14 @@
 package us.shandian.giga.ui.adapter;
 
+import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.v4.content.FileProvider;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.widget.RecyclerView;
@@ -24,6 +27,7 @@ import android.widget.Toast;
 import org.schabi.newpipe.R;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -46,13 +50,13 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         ALGORITHMS.put(R.id.sha1, "SHA1");
     }
 
-    private Context mContext;
+    private Activity mContext;
     private LayoutInflater mInflater;
     private DownloadManager mManager;
     private DownloadManagerService.DMBinder mBinder;
     private int mLayout;
 
-    public MissionAdapter(Context context, DownloadManagerService.DMBinder binder, DownloadManager manager, boolean isLinear) {
+    public MissionAdapter(Activity context, DownloadManagerService.DMBinder binder, DownloadManager manager, boolean isLinear) {
         mContext = context;
         mManager = manager;
         mBinder = binder;
@@ -247,7 +251,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
                     case R.id.md5:
                     case R.id.sha1:
                         DownloadMission mission = mManager.getMission(h.position);
-                        new ChecksumTask().execute(mission.location + "/" + mission.name, ALGORITHMS.get(id));
+                        new ChecksumTask(mContext).execute(mission.location + "/" + mission.name, ALGORITHMS.get(id));
                         return true;
                     default:
                         return false;
@@ -352,18 +356,26 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 
     }
 
-    private class ChecksumTask extends AsyncTask<String, Void, String> {
+    private static class ChecksumTask extends AsyncTask<String, Void, String> {
         ProgressDialog prog;
+        WeakReference<Activity> weakReference;
+
+        ChecksumTask(@NonNull Activity activity) {
+            weakReference = new WeakReference<>(activity);
+        }
 
         @Override
         protected void onPreExecute() {
             super.onPreExecute();
 
-            // Create dialog
+            Activity activity = getActivity();
-            prog = new ProgressDialog(mContext);
+            if (activity != null) {
-            prog.setCancelable(false);
+                // Create dialog
-            prog.setMessage(mContext.getString(R.string.msg_wait));
+                prog = new ProgressDialog(activity);
-            prog.show();
+                prog.setCancelable(false);
+                prog.setMessage(activity.getString(R.string.msg_wait));
+                prog.show();
+            }
         }
 
         @Override
@@ -374,8 +386,24 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
         @Override
         protected void onPostExecute(String result) {
             super.onPostExecute(result);
-            prog.dismiss();
+
-            Utility.copyToClipboard(mContext, result);
+            if (prog != null) {
+                Utility.copyToClipboard(prog.getContext(), result);
+                if (getActivity() != null) {
+                    prog.dismiss();
+                }
+            }
+        }
+
+        @Nullable
+        private Activity getActivity() {
+            Activity activity = weakReference.get();
+
+            if (activity != null && activity.isFinishing()) {
+                return null;
+            } else {
+                return activity;
+            }
         }
     }
 }

app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java

@@ -129,7 +129,7 @@ public abstract class MissionsFragment extends Fragment {
     }
 
     private void updateList() {
-        mAdapter = new MissionAdapter(mActivity, mBinder, mManager, mLinear);
+        mAdapter = new MissionAdapter((Activity) mActivity, mBinder, mManager, mLinear);
 
         if (mLinear) {
             mList.setLayoutManager(mLinearManager);

app/src/main/java/us/shandian/giga/util/Utility.java

@@ -12,6 +12,7 @@ import android.widget.Toast;
 import org.schabi.newpipe.R;
 
 import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -59,17 +60,17 @@ public class Utility {
         ObjectOutputStream objectOutputStream = null;
 
         try {
-            objectOutputStream = new ObjectOutputStream(new FileOutputStream(fileName));
+            objectOutputStream = new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(fileName)));
             objectOutputStream.writeObject(serializable);
         } catch (Exception e) {
             //nothing to do
-        }
+        } finally {
-
+            if(objectOutputStream != null) {
-        if(objectOutputStream != null) {
+                try {
-            try {
+                    objectOutputStream.close();
-                objectOutputStream.close();
+                } catch (Exception e) {
-            } catch (Exception e) {
+                    //nothing to do
-                //nothing to do
+                }
             }
         }
     }

app/src/main/res/layout/activity_main_player.xml

@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:background="@android:color/black"
     android:gravity="center">
 
     <com.google.android.exoplayer2.ui.AspectRatioFrameLayout

app/src/main/res/layout/dialog_playlists.xml

@@ -49,7 +49,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/separator"
-        android:background="?android:windowBackground"
         android:scrollbars="vertical"
         android:visibility="gone"
         tools:visibility="visible"