mirror of
https://github.com/kiwix/kiwix-android.git
synced 2025-09-18 11:55:38 -04:00
Changes After Review
This commit is contained in:
parent
4c7d4255e1
commit
dd0691880d
2
app/proguard-rules.pro
vendored
2
app/proguard-rules.pro
vendored
@ -25,7 +25,7 @@
|
|||||||
########################
|
########################
|
||||||
-dontobfuscate
|
-dontobfuscate
|
||||||
|
|
||||||
-keepclassmembers class com.cprcrack.videowebview.VideoEnabledWebView$JavascriptInterface { public *; }
|
-keepclassmembers class org.kiwix.videowebview.VideoEnabledWebView$JavascriptInterface { public *; }
|
||||||
|
|
||||||
#keep everything in kiwixlib
|
#keep everything in kiwixlib
|
||||||
-keep class org.kiwix.kiwixlib.** { *; }
|
-keep class org.kiwix.kiwixlib.** { *; }
|
||||||
|
@ -20,7 +20,7 @@ package org.kiwix.kiwixmobile.core.main
|
|||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.webkit.WebView
|
import android.webkit.WebView
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import com.cprcrack.videowebview.VideoEnabledWebChromeClient
|
import org.kiwix.videowebview.VideoEnabledWebChromeClient
|
||||||
|
|
||||||
class KiwixWebChromeClient(
|
class KiwixWebChromeClient(
|
||||||
private val callback: WebViewCallback,
|
private val callback: WebViewCallback,
|
||||||
|
@ -27,7 +27,7 @@ import android.view.ContextMenu
|
|||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.ViewGroup
|
import android.view.ViewGroup
|
||||||
import android.webkit.WebView
|
import android.webkit.WebView
|
||||||
import com.cprcrack.videowebview.VideoEnabledWebView
|
import org.kiwix.videowebview.VideoEnabledWebView
|
||||||
import io.reactivex.disposables.CompositeDisposable
|
import io.reactivex.disposables.CompositeDisposable
|
||||||
import org.kiwix.kiwixmobile.core.BuildConfig
|
import org.kiwix.kiwixmobile.core.BuildConfig
|
||||||
import org.kiwix.kiwixmobile.core.CoreApp.Companion.coreComponent
|
import org.kiwix.kiwixmobile.core.CoreApp.Companion.coreComponent
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Kiwix Android
|
* Kiwix Android
|
||||||
* Copyright (c) 2019 Kiwix <android.kiwix.org>
|
* Copyright (c) 2022 Kiwix <android.kiwix.org>
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@ -16,7 +16,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.cprcrack.videowebview;
|
package org.kiwix.videowebview;
|
||||||
|
|
||||||
import android.media.MediaPlayer;
|
import android.media.MediaPlayer;
|
||||||
import android.view.SurfaceView;
|
import android.view.SurfaceView;
|
@ -1,6 +1,6 @@
|
|||||||
/*
|
/*
|
||||||
* Kiwix Android
|
* Kiwix Android
|
||||||
* Copyright (c) 2019 Kiwix <android.kiwix.org>
|
* Copyright (c) 2022 Kiwix <android.kiwix.org>
|
||||||
* This program is free software: you can redistribute it and/or modify
|
* This program is free software: you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
@ -15,7 +15,7 @@
|
|||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
package com.cprcrack.videowebview
|
package org.kiwix.videowebview
|
||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
@ -56,20 +56,20 @@ open class VideoEnabledWebView : WebView {
|
|||||||
private var addedJavascriptInterface: Boolean
|
private var addedJavascriptInterface: Boolean
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
constructor(context: Context?) : super(context!!) {
|
constructor(context: Context) : super(context) {
|
||||||
addedJavascriptInterface = false
|
addedJavascriptInterface = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
constructor(context: Context?, attrs: AttributeSet?) : super(
|
constructor(context: Context, attrs: AttributeSet?) : super(
|
||||||
context!!, attrs
|
context, attrs
|
||||||
) {
|
) {
|
||||||
addedJavascriptInterface = false
|
addedJavascriptInterface = false
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unused")
|
@SuppressWarnings("unused")
|
||||||
constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(
|
constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(
|
||||||
context!!, attrs, defStyle
|
context, attrs, defStyle
|
||||||
) {
|
) {
|
||||||
addedJavascriptInterface = false
|
addedJavascriptInterface = false
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user