Start porting to geckoview

2026-01-10 05:58:09 -05:00 · 2019-03-06 20:26:03 -05:00
parent 6ab006de61
commit a68a3e4f90
5 changed files with 68 additions and 53 deletions
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -20,18 +20,27 @@ android {
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
    }
+    flavorDimensions "abi"
+
+    productFlavors {
+        x86     { dimension "abi" }
+        x86_64  { dimension "abi" }
+        arm     { dimension "abi" }
+        aarch64 { dimension "abi" }
+    }
 }

 dependencies {
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
    testImplementation 'junit:junit:4.12'
    androidTestImplementation 'com.android.support.test:runner:1.0.2'
    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'com.github.delight-im:Android-AdvancedWebView:v3.0.0'
    implementation "org.mozilla.components:service-firefox-accounts:${rootProject.ext.android_components_version}"
+    x86Implementation     "org.mozilla.geckoview:geckoview-${geckoviewChannel}-x86:${geckoviewVersion}"
+    x86_64Implementation  "org.mozilla.geckoview:geckoview-${geckoviewChannel}-x86_64:${geckoviewVersion}"
+    armImplementation     "org.mozilla.geckoview:geckoview-${geckoviewChannel}-armeabi-v7a:${geckoviewVersion}"
+    aarch64Implementation "org.mozilla.geckoview:geckoview-${geckoviewChannel}-arm64-v8a:${geckoviewVersion}"
 }

 task generateAndLinkBundle(type: Exec, description: 'Generate the android.js bundle and link it into the assets directory') {
--- a/android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt
+++ b/android/app/src/main/java/org/mozilla/sendandroid/MainActivity.kt
@@ -1,28 +1,26 @@
 package org.mozilla.sendandroid


-import android.support.v7.app.AppCompatActivity
 import android.os.Bundle
-import im.delight.android.webview.AdvancedWebView
 import android.graphics.Bitmap
-import android.content.Context
 import android.content.Intent
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.ComponentName
 import android.net.Uri
-import android.webkit.WebView
-import android.webkit.WebMessage
 import android.util.Log
 import android.util.Base64
-import android.view.View
 import android.webkit.ConsoleMessage
 import android.webkit.JavascriptInterface
 import android.webkit.WebChromeClient
 import mozilla.components.service.fxa.Config
 import mozilla.components.service.fxa.FirefoxAccount
-import mozilla.components.service.fxa.OAuthInfo
 import mozilla.components.service.fxa.Profile
 import mozilla.components.service.fxa.FxaResult
+import org.mozilla.geckoview.GeckoRuntime
+import org.mozilla.geckoview.GeckoSession
+import org.mozilla.geckoview.GeckoView
+

 internal class LoggingWebChromeClient : WebChromeClient() {
    override fun onConsoleMessage(cm: ConsoleMessage): Boolean {
@@ -44,8 +42,9 @@ class WebAppInterface(private val mContext: MainActivity) {
    }
 }

-class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
-    private var mWebView: AdvancedWebView? = null
+class MainActivity : Activity() {
+    private var mWebView: GeckoView? = null
+    private var mWebSession: GeckoSession? = null
    private var mToShare: String? = null
    private var mToCall: String? = null
    private var mAccount: FirefoxAccount? = null
@@ -57,16 +56,22 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
        // https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews
        // WebView.setWebContentsDebuggingEnabled(true); // TODO only dev builds

-        mWebView = findViewById<WebView>(R.id.webview) as AdvancedWebView
-        mWebView!!.setListener(this, this)
-        mWebView!!.setWebChromeClient(LoggingWebChromeClient())
-        mWebView!!.addJavascriptInterface(WebAppInterface(this), "Android")
-        mWebView!!.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+        // mWebView = findViewById<WebView>(R.id.webview) as AdvancedWebView
+        mWebView = findViewById(R.id.geckoview)
+        val session = GeckoSession()
+        mWebSession = session
+        val runtime = GeckoRuntime.create(this)
+        session.open(runtime)
+        mWebView!!.setSession(session)
+        //mWebView!!.setListener(this, this)
+        //mWebView!!.setWebChromeClient(LoggingWebChromeClient())
+        //mWebView!!.addJavascriptInterface(WebAppInterface(this), "Android")
+        // mWebView!!.setLayerType(View.LAYER_TYPE_HARDWARE, null);

-        val webSettings = mWebView!!.getSettings()
-        webSettings.setUserAgentString("Send Android")
-        webSettings.setAllowUniversalAccessFromFileURLs(true)
-        webSettings.setJavaScriptEnabled(true)
+        //val webSettings = mWebView!!.getSettings()
+        //webSettings.setUserAgentString("Send Android")
+        //webSettings.setAllowUniversalAccessFromFileURLs(true)
+        //webSettings.setJavaScriptEnabled(true)

        val intent = getIntent()
        val action = intent.getAction()
@@ -83,7 +88,10 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
                mToShare = "data:text/plain;base64," + Base64.encodeToString(imageUri.path.toByteArray(), 16).trim()
            }
        }
-        mWebView!!.loadUrl("file:///android_asset/android.html")
+        // session.loadUri("file:///android_asset/hello.html")
+        // session.loadUri("resource://android/assets/hello.html")
+        // session.loadUri("data:,Hello%2C%20World!")
+        session.loadUri("resource://android/")

    }

@@ -93,7 +101,7 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
            mAccount?.beginOAuthFlow(arrayOf("profile", "https://identity.mozilla.com/apps/send"), true)?.then(fun (url: String): FxaResult<Unit> {
                Log.w("CONFIG", "GOT A URL " + url)
                this@MainActivity.runOnUiThread({
-                    mWebView!!.loadUrl(url)
+                    mWebSession!!.loadUri(url)
                })
                return FxaResult.fromValue(Unit)
            })
@@ -115,41 +123,41 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
    @SuppressLint("NewApi")
    override fun onResume() {
        super.onResume()
-        mWebView!!.onResume()
+        // mWebView!!.onResume()
        // ...
    }

    @SuppressLint("NewApi")
    override fun onPause() {
-        mWebView!!.onPause()
+        // mWebView!!.onPause()
        // ...
        super.onPause()
    }

    override fun onDestroy() {
-        mWebView!!.onDestroy()
+        // mWebView!!.onDestroy()
        // ...
        super.onDestroy()
    }

    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
        super.onActivityResult(requestCode, resultCode, intent)
-        mWebView!!.onActivityResult(requestCode, resultCode, intent)
+        // mWebView!!.onActivityResult(requestCode, resultCode, intent)
        // ...
    }

    override fun onBackPressed() {
-        if (!mWebView!!.onBackPressed()) {
-            return
-        }
+        // if (!mWebView!!.onBackPressed()) {
+        //    return
+        // }
        // ...
        super.onBackPressed()
    }

-    override fun onPageStarted(url: String, favicon: Bitmap?) {
+ /*   override */ fun onPageStarted(url: String, favicon: Bitmap?) {
        if (url.startsWith("https://send.firefox.com/fxa/android-redirect.html")) {
            // We load this here so the user doesn't see the android-redirect.html page
-            mWebView!!.loadUrl("file:///android_asset/android.html")
+            mWebSession!!.loadUri("file:///android_asset/android.html")

            val parsed = Uri.parse(url)
            val code = parsed.getQueryParameter("code")
@@ -171,11 +179,11 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
                            this@MainActivity.runOnUiThread({
                                // Clear the history so that the user can't use the back button to see broken pages
                                // that were inserted into the history by the login process.
-                                mWebView!!.clearHistory()
+                                // mWebView!!.clearHistory()

                                // We also reload this here because we need to make sure onPageFinished runs after mToCall has been set.
                                // We can't guarantee that onPageFinished wasn't already called at this point.
-                                mWebView!!.loadUrl("file:///android_asset/android.html")
+                                mWebSession!!.loadUri("file:///android_asset/android.html")
                            })


@@ -188,32 +196,32 @@ class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
        Log.w("MAIN", "onPageStarted");
    }

-    override fun onPageFinished(url: String) {
+  /*  override */ fun onPageFinished(url: String) {
        Log.w("MAIN", "onPageFinished")
        if (mToShare != null) {
            Log.w("INTENT", mToShare)

-            mWebView?.postWebMessage(WebMessage(mToShare), Uri.EMPTY)
+            // mWebView?.postWebMessage(WebMessage(mToShare), Uri.EMPTY)
            mToShare = null
        }
        if (mToCall != null) {
            this@MainActivity.runOnUiThread({
-                mWebView?.evaluateJavascript(mToCall, fun (value: String) {
-                    mToCall = null
-                })
+                // mWebView?.evaluateJavascript(mToCall, fun (value: String) {
+                //    mToCall = null
+                // })
            })
        }
    }

-    override fun onPageError(errorCode: Int, description: String, failingUrl: String) {
+  /*  override */ fun onPageError(errorCode: Int, description: String, failingUrl: String) {
        Log.w("MAIN", "onPageError " + description)
    }

-    override fun onDownloadRequested(url: String, suggestedFilename: String, mimeType: String, contentLength: Long, contentDisposition: String, userAgent: String) {
+  /*  override */ fun onDownloadRequested(url: String, suggestedFilename: String, mimeType: String, contentLength: Long, contentDisposition: String, userAgent: String) {
        Log.w("MAIN", "onDownloadRequested")
    }

-    override fun onExternalPageRequest(url: String) {
+  /*  override */ fun onExternalPageRequest(url: String) {
        Log.w("MAIN", "onExternalPageRequest")
    }

--- a/android/app/src/main/res/layout/activity_main.xml
+++ b/android/app/src/main/res/layout/activity_main.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<android.widget.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=".MainActivity">

-    <im.delight.android.webview.AdvancedWebView
-        android:id="@+id/webview"
+    <org.mozilla.geckoview.GeckoView
+        android:id="@+id/geckoview"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />
-</android.support.constraint.ConstraintLayout>
+</android.widget.FrameLayout>
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,11 +1,8 @@
 <resources>

    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme">
        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
    </style>

 </resources>
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -3,13 +3,15 @@
 buildscript {
    ext.kotlin_version = '1.3.21'
    ext.android_components_version = '0.26.0'
+    ext.geckoviewChannel = "nightly"
+    ext.geckoviewVersion = "67.0.20190306095759"
    repositories {
        google()
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20"
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"

        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files