From bc5f94e2ee5794981c5d9b3c9635d20ae36e5699 Mon Sep 17 00:00:00 2001
From: khanhduytran0 <khanhduytran032@gmail.com>
Date: Wed, 9 Dec 2020 13:05:07 +0700
Subject: [PATCH] [MS OAuth] Try to return back to activity after login

---
 app/build.gradle                              |  2 +-
 app/src/main/AndroidManifest.xml              | 11 +++++++++-
 .../java/net/kdt/pojavlaunch/CustomTabs.java  | 20 +------------------
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 53038c1a8..86dc40638 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,7 +67,7 @@ dependencies {
     implementation 'com.android.support:preference-v14:26.0.0'
     implementation 'com.android.support:design:26.0.0'
     implementation 'com.android.support:support-annotations:26.0.0'
-    implementation 'com.android.support:customtabs:25.2.0'
+    implementation 'androidx.browser:browser:1.0.0'
     
     // implementation 'com.intuit.sdp:sdp-android:1.0.5'
     // implementation 'com.intuit.ssp:ssp-android:1.0.5'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a27073baa..17e65e4b2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,15 +19,24 @@
         android:value="ratio_float"/>
 		
 		<activity
+            android:launchMode="singleTop"
 			android:screenOrientation="sensorLandscape"
 			android:label="@string/app_short_name"
 			android:name=".PojavLoginActivity"
 			android:configChanges="keyboardHidden|orientation|screenSize|keyboard|navigation">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:host="login.live.com" android:scheme="https"
+                    android:pathPrefix="/oauth20_desktop.srf"/>
+            </intent-filter>
 		</activity>
 
 		<activity
diff --git a/app/src/main/java/net/kdt/pojavlaunch/CustomTabs.java b/app/src/main/java/net/kdt/pojavlaunch/CustomTabs.java
index 3e4e90bb2..ac5d841f0 100644
--- a/app/src/main/java/net/kdt/pojavlaunch/CustomTabs.java
+++ b/app/src/main/java/net/kdt/pojavlaunch/CustomTabs.java
@@ -1,13 +1,9 @@
 package net.kdt.pojavlaunch;
 
-import android.app.*;
 import android.content.*;
-import android.graphics.*;
 import android.net.*;
-import android.support.customtabs.*;
-import android.support.v4.content.*;
 import android.widget.*;
-import net.kdt.pojavlaunch.*;
+import androidx.browser.customtabs.*;
 
 public class CustomTabs {
 
@@ -18,18 +14,4 @@ public class CustomTabs {
         CustomTabsIntent customTabsIntent = builder.build();
         customTabsIntent.launchUrl(context, Uri.parse(url));
     }
-
-    public static class CopyBroadcastReceiver extends BroadcastReceiver {
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String url = intent.getDataString();
-
-            ClipboardManager clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-            ClipData data = ClipData.newPlainText("Link", url);
-            clipboardManager.setPrimaryClip(data);
-
-            Toast.makeText(context, "Copied " + url, Toast.LENGTH_SHORT).show();
-        }
-    }
 }