change url mid session (#24)

Author: LukasOgunfeitimi

OpacityCore/src/main/cpp/OpacityCore.cpp

@@ -149,6 +149,19 @@ extern "C" void android_present_webview(bool shouldIntercept) {
   env->CallVoidMethod(java_object, method, jshouldIntercept);
 }
 
+extern "C" void android_webview_change_url(const char *url) {
+  JNIEnv *env = GetJniEnv();
+  // Get the Kotlin class
+  jclass jOpacityCore = env->GetObjectClass(java_object);
+
+  // Get the method ID for the method you want to call
+  jmethodID method = env->GetMethodID(jOpacityCore, "changeUrlInBrowser",
+                                      "(Ljava/lang/String;)V");
+
+  jstring jurl = env->NewStringUTF(url);
+  env->CallVoidMethod(java_object, method, jurl);
+}
+
 extern "C" const char *get_ip_address() {
   struct ifaddrs *ifAddrStruct = nullptr;
   void *tmpAddrPtr = nullptr;
@@ -197,11 +210,11 @@ extern "C" bool android_is_app_foregrounded() {
 extern "C" const char *android_get_os_version() {
   JNIEnv *env = GetJniEnv();
   jclass jOpacityCore = env->GetObjectClass(java_object);
-  jmethodID method = env->GetMethodID(jOpacityCore, "getOsVersion", "()Ljava/lang/String;");
+  jmethodID method =
+      env->GetMethodID(jOpacityCore, "getOsVersion", "()Ljava/lang/String;");
   auto res = (jstring)env->CallObjectMethod(java_object, method);
 
-  if (res == nullptr)
-  {
+  if (res == nullptr) {
     return "";
   }
 
@@ -212,11 +225,11 @@ extern "C" const char *android_get_os_version() {
 extern "C" const char *android_get_device_manufacturer() {
   JNIEnv *env = GetJniEnv();
   jclass jOpacityCore = env->GetObjectClass(java_object);
-  jmethodID method = env->GetMethodID(jOpacityCore, "getDeviceManufacturer", "()Ljava/lang/String;");
+  jmethodID method = env->GetMethodID(jOpacityCore, "getDeviceManufacturer",
+                                      "()Ljava/lang/String;");
   auto res = (jstring)env->CallObjectMethod(java_object, method);
 
-  if (res == nullptr)
-  {
+  if (res == nullptr) {
     return "";
   }
 
@@ -227,11 +240,11 @@ extern "C" const char *android_get_device_manufacturer() {
 extern "C" const char *android_get_device_model() {
   JNIEnv *env = GetJniEnv();
   jclass jOpacityCore = env->GetObjectClass(java_object);
-  jmethodID method = env->GetMethodID(jOpacityCore, "getDeviceModel", "()Ljava/lang/String;");
+  jmethodID method =
+      env->GetMethodID(jOpacityCore, "getDeviceModel", "()Ljava/lang/String;");
   auto res = (jstring)env->CallObjectMethod(java_object, method);
 
-  if (res == nullptr)
-  {
+  if (res == nullptr) {
     return "";
   }
 
@@ -242,11 +255,11 @@ extern "C" const char *android_get_device_model() {
 extern "C" const char *android_get_device_locale() {
   JNIEnv *env = GetJniEnv();
   jclass jOpacityCore = env->GetObjectClass(java_object);
-  jmethodID method = env->GetMethodID(jOpacityCore, "getDeviceLocale", "()Ljava/lang/String;");
+  jmethodID method =
+      env->GetMethodID(jOpacityCore, "getDeviceLocale", "()Ljava/lang/String;");
   auto res = (jstring)env->CallObjectMethod(java_object, method);
 
-  if (res == nullptr)
-  {
+  if (res == nullptr) {
     return "";
   }
 
@@ -292,10 +305,10 @@ extern "C" int android_get_screen_dpi() {
 extern "C" const char *android_get_device_cpu() {
   JNIEnv *env = GetJniEnv();
   jclass jOpacityCore = env->GetObjectClass(java_object);
-  jmethodID method = env->GetMethodID(jOpacityCore, "getDeviceCpu", "()Ljava/lang/String;");
+  jmethodID method =
+      env->GetMethodID(jOpacityCore, "getDeviceCpu", "()Ljava/lang/String;");
   jstring jCpu = (jstring)env->CallObjectMethod(java_object, method);
-  if (jCpu == nullptr)
-  {
+  if (jCpu == nullptr) {
     return strdup("");
   }
   const char *cpu = env->GetStringUTFChars(jCpu, nullptr);
@@ -308,10 +321,10 @@ extern "C" const char *android_get_device_cpu() {
 extern "C" const char *android_get_device_codename() {
   JNIEnv *env = GetJniEnv();
   jclass jOpacityCore = env->GetObjectClass(java_object);
-  jmethodID method = env->GetMethodID(jOpacityCore, "getDeviceCodename", "()Ljava/lang/String;");
+  jmethodID method = env->GetMethodID(jOpacityCore, "getDeviceCodename",
+                                      "()Ljava/lang/String;");
   jstring jCodename = (jstring)env->CallObjectMethod(java_object, method);
-  if (jCodename == nullptr)
-  {
+  if (jCodename == nullptr) {
     return strdup("");
   }
   const char *codename = env->GetStringUTFChars(jCodename, nullptr);

OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/InAppBrowserActivity.kt

@@ -84,6 +84,20 @@ class InAppBrowserActivity : AppCompatActivity() {
     private val visitedUrls = mutableListOf<String>()
     private var interceptExtensionEnabled = false
 
+    private val changeUrlReceiver =
+        object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                if (intent?.action == "com.opacitylabs.opacitycore.CHANGE_URL") {
+                    currentUrl = intent.getStringExtra("url")!!
+                    if (geckoSession.isOpen) {
+                        geckoSession.loadUri(currentUrl)
+                    } else {
+                        Log.d("MainActivity", "Warning: Browser is not open.")
+                    }
+                }
+            }
+        }
+
     @SuppressLint("WrongThread")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -115,6 +129,11 @@ class InAppBrowserActivity : AppCompatActivity() {
             IntentFilter("com.opacitylabs.opacitycore.GET_COOKIES_FOR_DOMAIN")
         )
 
+        localBroadcastManager.registerReceiver(
+            changeUrlReceiver,
+            IntentFilter("com.opacitylabs.opacitycore.CHANGE_URL")
+        )
+
         supportActionBar?.setDisplayShowTitleEnabled(false)
 
         val closeButton =

OpacityCore/src/main/kotlin/com/opacitylabs/opacitycore/OpacityCore.kt

@@ -183,6 +183,12 @@ object OpacityCore {
         LocalBroadcastManager.getInstance(appContext).sendBroadcast(closeIntent)
     }
 
+    fun changeUrlInBrowser(url: String) {
+        val changeUrlIntent = Intent("com.opacitylabs.opacitycore.CHANGE_URL")
+        changeUrlIntent.putExtra("url", url)
+        LocalBroadcastManager.getInstance(appContext).sendBroadcast(changeUrlIntent)
+    }
+
     fun onBrowserDestroyed() {
         isBrowserActive = false
     }