Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for app links, fix double icon #190

Merged
merged 2 commits into from
Oct 31, 2019
Merged

Add support for app links, fix double icon #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbbd087
[#129] Use app links URL, change callback URL to https://
dzolnai Oct 29, 2019
e491ceb
Fix multiple launcher icon issue
dzolnai Oct 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ android {

// API
buildConfigField "String", "OAUTH_CLIENT_ID", "\"org.eduvpn.app.android\""
buildConfigField "String", "OAUTH_REDIRECT_URI", "\"org.eduvpn.app:/api/callback\""
buildConfigField "String", "OAUTH_REDIRECT_URI", "\"https://android.app.eduvpn.org/api/callback\""
buildConfigField "String", "OAUTH_SCOPE", "\"config\""
buildConfigField "String", "CERTIFICATE_DISPLAY_NAME", "\"eduVPN for Android\""

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
manifestPlaceholders = [
'appAuthRedirectScheme': 'org.eduvpn.app'
'appAuthRedirectHost': 'android.app.eduvpn.org',
]
missingDimensionStrategy 'implementation', 'ui' // Skeleton is no option for us because we need the log activity
}
Expand Down Expand Up @@ -62,11 +62,10 @@ 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", "\"org.letsconnect-vpn.app:/api/callback\""
buildConfigField "String", "OAUTH_REDIRECT_URI", "\"https://android.app.letsconnect-vpn.org/api/callback\""
buildConfigField "String", "CERTIFICATE_DISPLAY_NAME", "\"Let's Connect! for Android\""

manifestPlaceholders = [
'appAuthRedirectScheme': 'org.letsconnect-vpn.app'
'appAuthRedirectHost': 'android.app.letsconnect-vpn.org',
]
}
}
Expand All @@ -84,7 +83,6 @@ android {
}
}

def supportLibVersion = "28.0.0"
def daggerVersion = "2.25.2"
def okHttpVersion = "4.2.2"

Expand Down
23 changes: 23 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,29 @@
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
android:name="de.blinkt.openvpn.activities.MainActivity"
tools:node="remove"/>

<meta-data
android:name="android.content.APP_RESTRICTIONS"
Expand Down