Merge pull request #2 from epic-guys/develop

Version 0.1 tasks
epic-guys · Nov 16, 2023 · ec8a497 · ec8a497
2 parents afa3fd5 + aa10091
commit ec8a497
Show file tree

Hide file tree

Showing 18 changed files with 831 additions and 188 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/app/build.gradle b/app/build.gradle
@@ -42,10 +42,17 @@ dependencies {
     implementation 'org.conscrypt:conscrypt-android:2.5.2'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:4.11.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     // JWT
     implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
     runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.12.3'
-    runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.12.3'
+    //Secure storage
+    implementation 'com.github.adorsys:secure-storage-android:0.0.2' //unable to find artifact, fix later
+
+
+
+    implementation 'com.google.code.gson:gson:2.10.1'
+
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,9 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"></uses-permission>
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"></uses-permission>
 
-    <application
-        android:allowBackup="true"
+
+<application
+        android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"

diff --git a/app/src/main/java/models/API/API.java b/app/src/main/java/models/API/API.java