From 89a09f1b88ca4624ed2c3d4cf00a2bb9b3aa4248 Mon Sep 17 00:00:00 2001
From: Peter Stuifzand <peter@stuifzand.eu>
Date: Thu, 26 Apr 2018 02:01:05 +0200
Subject: [PATCH] Use new client_id and redirect_uri

---
 app/src/main/AndroidManifest.xml                              | 4 +---
 .../eu/stuifzand/micropub/auth/AuthenticationActivity.java    | 4 ++--
 .../main/java/eu/stuifzand/micropub/auth/Authenticator.java   | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a0c8808..e4fce38 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -54,11 +54,9 @@
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
-                <data android:scheme="wrimini" />
+                <data android:scheme="https" android:host="wrimini.net" />
             </intent-filter>
         </activity>
-        <activity android:name=".auth.AccountsActivity" />
-
         <service
             android:name=".auth.AuthenticatorService"
             android:enabled="true"
diff --git a/app/src/main/java/eu/stuifzand/micropub/auth/AuthenticationActivity.java b/app/src/main/java/eu/stuifzand/micropub/auth/AuthenticationActivity.java
index 13256af..843c211 100644
--- a/app/src/main/java/eu/stuifzand/micropub/auth/AuthenticationActivity.java
+++ b/app/src/main/java/eu/stuifzand/micropub/auth/AuthenticationActivity.java
@@ -52,8 +52,8 @@ public class AuthenticationActivity extends AccountAuthenticatorActivity {
 
         HttpUrl.Builder builder = HttpUrl.parse(endpoint).newBuilder();
         builder.setQueryParameter("me", me)
-                .setQueryParameter("client_id", "https://stuifzand.eu/micropub")
-                .setQueryParameter("redirect_uri", "wrimini://oauth")
+                .setQueryParameter("client_id", "https://wrimini.net")
+                .setQueryParameter("redirect_uri", "https://wrimini.net/oauth/callback")
                 .setQueryParameter("response_type", "code")
                 .setQueryParameter("state", "1234") // @TODO use random states, check the state later
                 .setQueryParameter("scope", "create"); // @TODO use different scope
diff --git a/app/src/main/java/eu/stuifzand/micropub/auth/Authenticator.java b/app/src/main/java/eu/stuifzand/micropub/auth/Authenticator.java
index ca00861..fc4a72b 100644
--- a/app/src/main/java/eu/stuifzand/micropub/auth/Authenticator.java
+++ b/app/src/main/java/eu/stuifzand/micropub/auth/Authenticator.java
@@ -75,8 +75,8 @@ public class Authenticator extends AbstractAccountAuthenticator {
         if (TextUtils.isEmpty(authToken)) {
             RequestBody formBody = new FormBody.Builder()
                     .add("code", am.getPassword(account))
-                    .add("redirect_uri", "wrimini://oauth")
-                    .add("client_id", "https://stuifzand.eu/micropub")
+                    .add("client_id", "https://wrimini.net")
+                    .add("redirect_uri", "https://wrimini.net/oauth/callback")
                     .add("me", account.name)
                     .add("grant_type", "authorization_code")
                     .build();