Merge branch 'dev' into androidx-media-audioreactor

TeamNewPipe · Dec 19, 2020 · e4e7958 · e4e7958
2 parents d12caca + 2880280
commit e4e7958
Show file tree

Hide file tree

Showing 103 changed files with 2,398 additions and 1,732 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         resValue "string", "app_name", "NewPipe"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 959
-        versionName "0.20.5"
+        versionCode 960
+        versionName "0.20.6"
 
         multiDexEnabled true
 
@@ -85,6 +85,10 @@ android {
     sourceSets {
         androidTest.assets.srcDirs += files("$projectDir/schemas".toString())
     }
+
+    buildFeatures {
+        viewBinding true
+    }
 }
 
 ext {
@@ -175,7 +179,7 @@ dependencies {
 
     // NewPipe dependencies
     // You can use a local version by uncommenting a few lines in settings.gradle
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:175df679e05b24b6094570d719cc11f8dfc17c68'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:85fa006214b003f21eacb76c445a167732f19981'
     implementation "com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751"
 
     implementation "org.jsoup:jsoup:1.13.1"
@@ -199,7 +203,8 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.documentfile:documentfile:1.0.1'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation "androidx.media:media:1.2.1"
+    implementation 'androidx.media:media:1.2.1'
+    implementation 'androidx.webkit:webkit:1.4.0'
 
     implementation "androidx.lifecycle:lifecycle-livedata:${androidxLifecycleVersion}"
     implementation "androidx.lifecycle:lifecycle-viewmodel:${androidxLifecycleVersion}"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -227,20 +227,18 @@
                 <data android:host="invidio.us" />
                 <data android:host="dev.invidio.us" />
                 <data android:host="www.invidio.us" />
+                <data android:host="vid.encryptionin.space" />
                 <data android:host="invidious.snopyta.org" />
-                <data android:host="fi.invidious.snopyta.org" />
                 <data android:host="yewtu.be" />
-                <data android:host="invidious.ggc-project.de" />
-                <data android:host="yt.maisputain.ovh" />
-                <data android:host="invidious.13ad.de" />
-                <data android:host="invidious.toot.koeln" />
+                <data android:host="tube.connect.cafe" />
+                <data android:host="invidious.zapashcanon.fr" />
+                <data android:host="invidious.kavin.rocks" />
+                <data android:host="invidious.tube" />
+                <data android:host="invidious.site" />
+                <data android:host="invidious.xyz" />
+                <data android:host="vid.mint.lgbt" />
+                <data android:host="invidiou.site" />
                 <data android:host="invidious.fdn.fr" />
-                <data android:host="watch.nettohikari.com" />
-                <data android:host="invidious.snwmds.net" />
-                <data android:host="invidious.snwmds.org" />
-                <data android:host="invidious.snwmds.com" />
-                <data android:host="invidious.sunsetravens.com" />
-                <data android:host="invidious.gachirangers.com" />
                 <data android:pathPrefix="/" />
             </intent-filter>
 

diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java
@@ -242,8 +242,9 @@ private void initNotificationChannels() {
         String name = getString(R.string.notification_channel_name);
         String description = getString(R.string.notification_channel_description);
 
-        // Keep this below DEFAULT to avoid making noise on every notification update
-        final int importance = NotificationManager.IMPORTANCE_LOW;
+        // Keep this below DEFAULT to avoid making noise on every notification update for the main
+        // and update channels
+        int importance = NotificationManager.IMPORTANCE_LOW;
 
         final NotificationChannel mainChannel = new NotificationChannel(id, name, importance);
         mainChannel.setDescription(description);
@@ -255,9 +256,17 @@ private void initNotificationChannels() {
         final NotificationChannel appUpdateChannel = new NotificationChannel(id, name, importance);
         appUpdateChannel.setDescription(description);
 
+        id = getString(R.string.hash_channel_id);
+        name = getString(R.string.hash_channel_name);
+        description = getString(R.string.hash_channel_description);
+        importance = NotificationManager.IMPORTANCE_HIGH;
+
+        final NotificationChannel hashChannel = new NotificationChannel(id, name, importance);
+        hashChannel.setDescription(description);
+
         final NotificationManager notificationManager = getSystemService(NotificationManager.class);
         notificationManager.createNotificationChannels(Arrays.asList(mainChannel,
-                appUpdateChannel));
+                appUpdateChannel, hashChannel));
     }
 
     protected boolean isDisposedRxExceptionsReported() {

diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java
@@ -48,13 +48,13 @@ private CheckForNewAppVersion() { }
 
     private static final String GITHUB_APK_SHA1
             = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15";
-    private static final String NEWPIPE_API_URL = "https://newpipe.schabi.org/api/data.json";
+    private static final String NEWPIPE_API_URL = "https://newpipe.net/api/data.json";
 
     /**
-     * Method to get the apk's SHA1 key. See https://stackoverflow.com/questions/9293019/#22506133.
+     * Method to get the APK's SHA1 key. See https://stackoverflow.com/questions/9293019/#22506133.
      *
      * @param application The application
-     * @return String with the apk's SHA1 fingeprint in hexadecimal
+     * @return String with the APK's SHA1 fingerprint in hexadecimal
      */
     @NonNull
     private static String getCertificateSHA1Fingerprint(@NonNull final Application application) {