Skip to content
This repository was archived by the owner on Aug 21, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .configure
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"project_name": "Gravatar-Android",
"branch": "trunk",
"pinned_hash": "3c8238c6aa7b0098bd4ccf24e0a7b6178e3ee2a7",
"pinned_hash": "ef6f012d234d67a5d9bca642ede2c37be9436ff2",
"files_to_copy": [
{
"file": "android/Gravatar-Android/secrets.properties",
Expand Down
Binary file modified .configure-files/secrets.properties.enc
Binary file not shown.
10 changes: 6 additions & 4 deletions loginUi/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import java.net.URI
import java.util.Properties

plugins {
Expand Down Expand Up @@ -31,10 +32,11 @@ android {
"OAUTH_CLIENT_SECRET",
"\"${properties["oauth.clientSecret"]?.toString() ?: ""}\"",
)
manifestPlaceholders["OAUTH_REDIRECT_URI_HOST"] =
properties["oauth.redirectUri"]?.toString()?.split("://")?.get(1) ?: ""
manifestPlaceholders["OAUTH_REDIRECT_URI_SCHEME"] =
properties["oauth.redirectUri"]?.toString()?.split("://")?.first() ?: ""

val redirectUri = properties["oauth.redirectUri"]?.let { URI(it.toString()) }
manifestPlaceholders["OAUTH_REDIRECT_URI_PATH"] = redirectUri?.path.orEmpty()
manifestPlaceholders["OAUTH_REDIRECT_URI_HOST"] = redirectUri?.host.orEmpty()
manifestPlaceholders["OAUTH_REDIRECT_URI_SCHEME"] = redirectUri?.scheme.orEmpty()
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion loginUi/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@
android:launchMode="singleTask"
android:theme="@style/GravatarOAuth">

<intent-filter>
<intent-filter android:autoVerify="true">
<action android:name="android.intent.action.VIEW" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />

<data
android:path="${OAUTH_REDIRECT_URI_PATH}"
android:host="${OAUTH_REDIRECT_URI_HOST}"
android:scheme="${OAUTH_REDIRECT_URI_SCHEME}" />
</intent-filter>
Expand Down