From dfa99738f33e175360f0d19b1417fa1cc4a4972c Mon Sep 17 00:00:00 2001
From: Lars Refsgaard <1552887+LarsRefsgaard@users.noreply.github.com>
Date: Mon, 9 Oct 2023 14:00:32 +0200
Subject: [PATCH] Used AGP assistant in Android Studio

---
 android/app/build.gradle                        |  3 ++-
 android/app/src/debug/AndroidManifest.xml       |  3 +--
 android/app/src/main/AndroidManifest.xml        | 17 ++++++++++++++++-
 android/app/src/profile/AndroidManifest.xml     |  3 +--
 android/build.gradle                            |  2 +-
 android/gradle.properties                       |  3 +--
 .../gradle/wrapper/gradle-wrapper.properties    |  2 +-
 7 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 32e5b08f..832dc777 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
 }
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -74,6 +74,7 @@ android {
     lint {
         disable 'InvalidPackage'
     }
+    namespace 'dk.cachet.carp_study_app'
 }
 
 flutter {
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index d4681f23..ab133beb 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dk.cachet.carp_study_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 7894cad0..a3d3fe90 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dk.cachet.carp_study_app"
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />
@@ -47,6 +46,22 @@
         android:name="${applicationName}"
         android:label="CARP Studies"
         android:icon="@mipmap/ic_launcher">
+        <activity
+            android:name="net.openid.appauth.RedirectUriReceiverActivity"
+            android:exported="true"
+            tools:node="replace">
+            <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:scheme="carp-studies" />
+                <data android:scheme="http" android:host="carp.computerome.dk" android:path="/auth/devp" />
+                <data android:scheme="carp.studies" />
+                <data android:scheme="studies" />
+                <data android:scheme="carp-studies" />
+
+            </intent-filter>
+        </activity>
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index cc29b297..f880684a 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="dk.cachet.carp_study_app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/android/build.gradle b/android/build.gradle
index 65e00593..9879209a 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
diff --git a/android/gradle.properties b/android/gradle.properties
index a6738207..4d3226ab 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
-android.enableJetifier=true
-android.enableR8=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 38e16848..0bc3d49c 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip