From d39bbccb5ac4312257f7865755107cdb4a365cc4 Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sun, 7 Jun 2020 14:48:34 -0400
Subject: [PATCH] Revert "Alternate open source licenses plugin"

This reverts commit 22f26f8288279cdf2a675a8b4f262419df4a9a3d.
---
 .gitignore                                    |  1 -
 app/build.gradle                              | 29 ++-----------------
 app/src/main/AndroidManifest.xml              |  7 +++++
 .../tachiyomi/ui/more/AboutController.kt      | 18 ++----------
 build.gradle.kts                              |  2 +-
 5 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/.gitignore b/.gitignore
index e11ca1074..e305aeb86 100755
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@
 /build
 *.apk
 app/**/output.json
-open_source_licenses.html
 
 # Hebrew assets are copied on build
 app/src/main/res/values-iw/
diff --git a/app/build.gradle b/app/build.gradle
index 7e3d00a76..f6c83ef02 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.AbstractKotlinCompile
 import java.text.SimpleDateFormat
 
 apply plugin: 'com.android.application'
-apply plugin: 'com.jaredsburrows.license'
+apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
@@ -33,13 +33,6 @@ ext {
     }
 }
 
-licenseReport {
-    generateHtmlReport = true
-    generateJsonReport = false
-
-    copyHtmlReportToAssets = true
-}
-
 android {
     compileSdkVersion 29
     buildToolsVersion '29.0.3'
@@ -97,9 +90,6 @@ android {
             buildConfigField "boolean", "INCLUDE_UPDATER", "true"
             dimension "default"
         }
-        fdroid {
-            dimension "default"
-        }
         dev {
             resConfigs "en", "xxhdpi"
             dimension "default"
@@ -378,22 +368,7 @@ task copyResources(type: Copy) {
     include '**/*'
 }
 
-// See https://github.com/jaredsburrows/gradle-license-plugin/issues/113
-task licenseReportPreBuild(type: Exec) {
-    switch (getGradle().getStartParameter().getTaskRequests().toString()) {
-        case ~/.*Standard.*/:
-            commandLine '../gradlew', 'licenseStandardReleaseReport'
-            break
-        case ~/.*Fdroid.*/:
-            commandLine '../gradlew', 'licenseFdroidReleaseReport'
-            break
-        case ~/.*Dev.*/:
-            commandLine '../gradlew', 'licenseDevReleaseReport'
-            break
-    }
-}
-
-preBuild.dependsOn(ktlintFormat, copyResources, licenseReportPreBuild)
+preBuild.dependsOn(ktlintFormat, copyResources)
 
 if (getGradle().getStartParameter().getTaskRequests().toString().contains("Standard")) {
     apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4baf7d19e..fc9488729 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -133,6 +133,13 @@
             android:name=".extension.util.ExtensionInstallActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
 
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
+            android:theme="@style/Theme.MaterialComponents" />
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
+            android:theme="@style/Theme.MaterialComponents" />
+
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
index 1cdf2b105..ad0455dcf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/more/AboutController.kt
@@ -5,10 +5,9 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Build
 import android.os.Bundle
-import android.webkit.WebView
 import androidx.preference.PreferenceScreen
 import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.customview.customView
+import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
 import eu.kanade.tachiyomi.BuildConfig
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.updater.UpdateChecker
@@ -126,7 +125,7 @@ class AboutController : SettingsController() {
                 titleRes = R.string.licenses
 
                 onClick {
-                    LicensesDialogController().showDialog(router)
+                    startActivity(Intent(activity, OssLicensesMenuActivity::class.java))
                 }
             }
         }
@@ -161,19 +160,6 @@ class AboutController : SettingsController() {
         }
     }
 
-    class LicensesDialogController(bundle: Bundle? = null) : DialogController(bundle) {
-
-        override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-            val webView = WebView(activity!!)
-            webView.loadUrl("file:///android_asset/open_source_licenses.html")
-
-            return MaterialDialog(activity!!)
-                .title(res = R.string.licenses)
-                .customView(view = webView)
-                .positiveButton(res = android.R.string.ok)
-        }
-    }
-
     class NewUpdateDialogController(bundle: Bundle? = null) : DialogController(bundle) {
 
         constructor(body: String, url: String) : this(
diff --git a/build.gradle.kts b/build.gradle.kts
index fbd5ea118..aee5d3c75 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -42,7 +42,7 @@ buildscript {
         classpath("com.github.ben-manes:gradle-versions-plugin:0.28.0")
         classpath("com.github.zellius:android-shortcut-gradle-plugin:0.1.2")
         classpath("com.google.gms:google-services:4.3.3")
-        classpath("com.jaredsburrows:gradle-license-plugin:0.8.80")
+        classpath("com.google.android.gms:oss-licenses-plugin:0.10.2")
         // Realm (EH)
         classpath("io.realm:realm-gradle-plugin:6.0.2")