Revert "[#129] Use app links URL, change callback URL to https://"

This reverts commit fbbd087.
eduvpn · Nov 20, 2019 · e700ffe · e700ffe
1 parent e80929d
commit e700ffe
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -24,13 +24,13 @@ android {
 
         // API
         buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.eduvpn.app.android\""
-        buildConfigField "String", "OAUTH_REDIRECT_URI", "\"https://android.app.eduvpn.org/api/callback\""
+        buildConfigField "String", "OAUTH_REDIRECT_URI", "\"org.eduvpn.app:/api/callback\""
         buildConfigField "String", "OAUTH_SCOPE", "\"config\""
         buildConfigField "String", "CERTIFICATE_DISPLAY_NAME", "\"eduVPN for Android\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         manifestPlaceholders = [
-                'appAuthRedirectHost': 'android.app.eduvpn.org',
+                'appAuthRedirectScheme': 'org.eduvpn.app'
         ]
         missingDimensionStrategy 'implementation', 'ui' // Skeleton is no option for us because we need the log activity
 
@@ -75,10 +75,11 @@ android {
             // API discovery is disabled, and only custom URLs can be entered.
             buildConfigField "boolean", "API_DISCOVERY_ENABLED", "false"
             buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.letsconnect-vpn.app.android\""
-            buildConfigField "String", "OAUTH_REDIRECT_URI", "\"https://android.app.letsconnect-vpn.org/api/callback\""
+            buildConfigField "String", "OAUTH_REDIRECT_URI", "\"org.letsconnect-vpn.app:/api/callback\""
             buildConfigField "String", "CERTIFICATE_DISPLAY_NAME", "\"Let's Connect! for Android\""
+
             manifestPlaceholders = [
-                    'appAuthRedirectHost': 'android.app.letsconnect-vpn.org',
+                    'appAuthRedirectScheme': 'org.letsconnect-vpn.app'
             ]
         }
     }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -130,24 +130,6 @@
             android:name=".LicenseActivity"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme.NoActionBar" />
-
-        <activity
-            android:name="net.openid.appauth.RedirectUriReceiverActivity"
-            tools:node="replace">
-            <intent-filter
-                android:autoVerify="true"
-                tools:targetApi="m">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="${appAuthRedirectHost}"
-                    android:path="/api/callback"
-                    android:scheme="https" />
-            </intent-filter>
-        </activity>
 
         <!-- Remove the MainActivity of the ICS-OpenVPN library-->
         <activity