feat: log out of auth0

fix: fixed newer version java issues
immutable · Dec 18, 2023 · c6b2ed6 · c6b2ed6
1 parent faf892a
commit c6b2ed6
Show file tree

Hide file tree

Showing 7 changed files with 248 additions and 138 deletions.
diff --git a/Source/Immutable/Immutable_UPL_Android.xml b/Source/Immutable/Immutable_UPL_Android.xml
@@ -55,11 +55,11 @@
         <insert>
             public native void handleDeepLink(String Deeplink);
 
-            public native void handleOnCustomTabsDismissed();
+            public native void handleOnCustomTabsDismissed(String Url);
 
             @Override
-            public void onCustomTabsDismissed() {
-                handleOnCustomTabsDismissed();
+            public void onCustomTabsDismissed(String Url) {
+                handleOnCustomTabsDismissed(Url);
             }
         </insert>
     </gameActivityClassAdditions>

diff --git a/Source/Immutable/Private/Immutable/Android/ImmutableAndroidJNI.cpp b/Source/Immutable/Private/Immutable/Android/ImmutableAndroidJNI.cpp
@@ -1,23 +1,69 @@
 #include "ImmutableAndroidJNI.h"
+
 #include "Immutable/ImmutablePassport.h"
+#include "Immutable/ImmutableSubsystem.h"
+
 
 #if PLATFORM_ANDROID
-JNI_METHOD void
-Java_com_epicgames_unreal_GameActivity_handleDeepLink(JNIEnv *env, jobject obj,
-                                                      jstring jDeeplink) {
-  if (env->IsSameObject(jDeeplink, NULL)) {
-    return;
+
+const UImmutablePassport* GetPassport()
+{
+  if (!GEngine)
+  {
+    return nullptr;
+  }
+
+  const auto GameWorld = GEngine->GetWorld();
+
+  if (!GameWorld)
+  {
+    return nullptr;
+  }
+
+  auto ImmutableSubsystem = GameWorld->GetGameInstance()->GetSubsystem<UImmutableSubsystem>();
+
+  if (!ImmutableSubsystem)
+  {
+    return nullptr;
   }
 
-  const char *deeplinkCStr = env->GetStringUTFChars(jDeeplink, NULL);
-  const FString deeplink = FString(UTF8_TO_TCHAR(deeplinkCStr));
-  UImmutablePassport::HandleDeepLink(deeplink);
-  env->ReleaseStringUTFChars(jDeeplink, deeplinkCStr);
+  auto Passport = ImmutableSubsystem->GetPassport();
+
+  if (!Passport.IsValid())
+  {
+    return nullptr;
+  }
+
+  return Passport.Get();
+}
+
+JNI_METHOD void Java_com_epicgames_unreal_GameActivity_handleDeepLink(JNIEnv *env, jobject obj, jstring jDeeplink)
+{
+	if (env->IsSameObject(jDeeplink, NULL))
+	{
+		return;
+	}
+
+	const char *deeplinkCStr = env->GetStringUTFChars(jDeeplink, NULL);
+	const FString deeplink = FString(UTF8_TO_TCHAR(deeplinkCStr));
+
+	if (auto Passport = GetPassport())
+	{
+		Passport->HandleDeepLink(deeplink);
+	}
+	env->ReleaseStringUTFChars(jDeeplink, deeplinkCStr);
 }
 
-JNI_METHOD void
-Java_com_epicgames_unreal_GameActivity_handleOnCustomTabsDismissed(
-    JNIEnv *env, jobject obj) {
-  UImmutablePassport::HandleCustomTabsDismissed();
+JNI_METHOD void Java_com_epicgames_unreal_GameActivity_handleOnCustomTabsDismissed(JNIEnv *env, jobject obj, jstring jUrl)
+{
+	if (env->IsSameObject(jUrl, NULL))
+	{
+		return;
+	}
+
+	if (auto Passport = GetPassport())
+	{
+		Passport->HandleCustomTabsDismissed(FString(UTF8_TO_TCHAR(env->GetStringUTFChars(jUrl, NULL))));
+	}
 }
 #endif
diff --git a/Source/Immutable/Private/Immutable/Android/ImmutableAndroidJNI.h b/Source/Immutable/Private/Immutable/Android/ImmutableAndroidJNI.h
@@ -3,14 +3,11 @@
 #if PLATFORM_ANDROID
 #include "Android/AndroidJNI.h"
 
-extern "C" {
-JNI_METHOD void Java_com_epicgames_unreal_GameActivity_handleDeepLink(JNIEnv *,
-                                                                      jobject,
-                                                                      jstring);
+extern "C"
+{
+JNI_METHOD void Java_com_epicgames_unreal_GameActivity_handleDeepLink(JNIEnv *, jobject, jstring);
 
-JNI_METHOD void
-Java_com_epicgames_unreal_GameActivity_handleOnCustomTabsDismissed(JNIEnv *,
-                                                                   jobject);
+JNI_METHOD void Java_com_epicgames_unreal_GameActivity_handleOnCustomTabsDismissed(JNIEnv *, jobject, jstring);
 }
 
 #endif
diff --git a/Source/Immutable/Private/Immutable/Android/Java/ImmutableAndroid.java b/Source/Immutable/Private/Immutable/Android/Java/ImmutableAndroid.java
@@ -43,7 +43,7 @@ private static int getCustomTabsHeight(Activity context) {
         }
     }
 
-    public static void launchUrl(Activity context, String url) {
+    public static void launchUrl(final Activity context, final String url) {
         // Get all apps that can support Custom Tabs Service
         // i.e. services that can handle ACTION_CUSTOM_TABS_CONNECTION intents
         PackageManager packageManager = context.getPackageManager();
@@ -84,7 +84,7 @@ public void onNavigationEvent(int navigationEvent, @Nullable Bundle extras) {
                                     handler.postDelayed(new Runnable() {
                                         @Override
                                         public void run() {
-                                            ((Callback) context).onCustomTabsDismissed();
+                                            ((Callback) context).onCustomTabsDismissed(url);
                                         }
                                     }, 1000);
                                 }
@@ -107,6 +107,6 @@ public void run() {
     }
 
     public interface Callback {
-        void onCustomTabsDismissed();
+        void onCustomTabsDismissed(String url);
     }
 }