Merge pull request #15 from aleksander-haugas/VaultScala

Vault scala

Author: hayzamjs

app/CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.4.1)
 message(STATUS ABI_INFO  = ${ANDROID_ABI})
 
+
 add_library( monerujo
              SHARED
              src/main/cpp/monerujo.cpp )

app/build.gradle

@@ -5,10 +5,11 @@ android {
         applicationId "io.scalaproject.vault"
         buildToolsVersion = '34.0.0'
         compileSdk 34
-        minSdkVersion 21
-        targetSdkVersion 34
-        versionCode 16
-        versionName "1.1.5"
+        minSdk 23
+        //noinspection OldTargetApi
+        targetSdk 34
+        versionCode 17
+        versionName "1.2.0"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         externalNativeBuild {
@@ -20,9 +21,11 @@ android {
 
         ndk {
             //noinspection ChromeOsAbiSupport
-            abiFilters 'arm64-v8a', 'x86_64', 'armeabi-v7a'
+            abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86_64'
         }
         resourceConfigurations += ['en', 'fr', 'de', 'el', 'eo', 'es', 'et', 'hu', 'it', 'ja', 'nb', 'nl', 'pt', 'pt-rBR', 'ro', 'ru', 'sk', 'sr', 'sv', 'uk', 'zh-rCN', 'zh-rTW']
+        signingConfig signingConfigs.debug
+        proguardFiles 'proguard-rules.pro'
     }
 
     flavorDimensions 'type', 'net'
@@ -89,6 +92,16 @@ android {
     // Enumerate translated locales
     def availableLocales = ["en"]
     namespace 'io.scalaproject.vault'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+    dependenciesInfo {
+        includeInApk false
+        includeInBundle false
+    }
+    compileSdk 34
+    ndkVersion '25.1.8937393'
     new File("app/src/main/res/").eachFileMatch(~/^values-.*/) { file ->
         def languageTag = file.name.substring(7).replace("-r", "-")
         availableLocales.add(languageTag)
@@ -115,23 +128,32 @@ android {
     }
 }
 
-dependencies {
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs << "--enable-preview"
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+    }
+}
 
-    implementation 'com.google.android.material:material:1.11.0' // keep version 1.0.0 as it fixes a bug with Material Button
+dependencies {
+    implementation 'com.google.android.material:material:1.12.0' // keep version 1.0.0 as it fixes a bug with Material Button
     implementation "com.android.support:support-v4"
     implementation "com.android.support:recyclerview-v7"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
-    implementation 'com.google.android.material:material:1.11.0'  // keep version 1.1.0 as it fixes a bug with Material Button
-    implementation 'androidx.appcompat:appcompat:1.6.1'  // keep version 1.1.0 as it fixes a bug with Material Button
+    implementation 'com.google.android.material:material:1.12.0'  // keep version 1.1.0 as it fixes a bug with Material Button
+    implementation 'androidx.appcompat:appcompat:1.7.0'  // keep version 1.1.0 as it fixes a bug with Material Button
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
     implementation 'me.dm7.barcodescanner:zxing:1.9.8'
 
     //noinspection GradleDependency
     implementation 'com.squareup.okhttp3:okhttp:3.0.1' // keep version 3.0.1 to avoid errors
-    implementation "com.burgstaller:okhttp-digest:1.18"
+    implementation 'io.github.rburgst:okhttp-digest:3.1.1'
     implementation "com.jakewharton.timber:timber:5.0.1"
 
     implementation 'com.nulab-inc:zxcvbn:1.5.2'
@@ -143,6 +165,7 @@ dependencies {
 
     implementation 'com.github.yalantis:ucrop:2.2.8'
 
+
     testImplementation "junit:junit:4.13.2"
     testImplementation "org.mockito:mockito-all:$rootProject.ext.mockitoVersion"
     testImplementation "com.squareup.okhttp3:mockwebserver:4.9.3"
@@ -154,4 +177,15 @@ dependencies {
     implementation "ch.acra:acra-mail:$acraVersion"
 
     implementation 'com.unstoppabledomains:resolution:3.0.0'
+    // implementation 'com.yubico.yubikit:core:(insert version here)' for Multi factor auth --> extra security layer
+
+    // This is for the game or multiuser realtime interaction branch ... Title ???
+    // ===============================================================
+    // implementation 'com.github.heroiclabs.nakama-java:nakama-java:<commit>'
+    // implementation 'com.github.heroiclabs.nakama-java:satori-java:<commit>'
+
+
+    // or, depend on the fat Jar which bundles all of the Nakama Java dependencies into a single Jar.
+    // implementation 'com.github.heroiclabs.nakama-java:nakama-java-all:<commit>'
+    // implementation 'com.github.heroiclabs.nakama-java:satori-java-all:<commit>'
 }

app/src/main/AndroidManifest.xml

@@ -1,32 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:installLocation="internalOnly">
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.NFC" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" tools:ignore="SelectedPhotoAccess" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+
+    <!-- Compatibility across different Android versions -->
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="34" tools:ignore="GradleOverrides" />
+
+    <!-- Permissions for USB (Hardware Wallets -> New Implementation)-->
+    <uses-feature android:name="android.hardware.usb.host" />
+    <uses-feature android:name="android.hardware.usb.accessory" android:required="false" />
 
     <application
         android:name=".ScalaVaultApplication"
-        android:allowBackup="false"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         android:requestLegacyExternalStorage="true"
-        tools:targetApi="s"
+        tools:targetApi="tiramisu"
         android:dataExtractionRules="@xml/data_extraction_rules"
-        tools:ignore="DataExtractionRules">
+        tools:ignore="DataExtractionRules"
+        android:localeConfig="@xml/locales_config"
+        android:enableOnBackInvokedCallback="true">
 
         <activity
             android:name="com.yalantis.ucrop.UCropActivity"
@@ -49,6 +58,10 @@
             android:launchMode="singleTask"
             android:screenOrientation="behind" />
 
+        <activity
+            android:name=".NetworkActivity"
+            android:exported="false" />
+
         <activity
             android:name=".WalletActivity"
             android:configChanges="orientation|keyboardHidden"
@@ -98,7 +111,8 @@
             android:name=".service.WalletService"
             android:description="@string/service_description"
             android:exported="false"
-            android:label="Scala Wallet Service" />
+            android:label="Scala Wallet Service"
+            android:foregroundServiceType="dataSync" />
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -109,5 +123,18 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/filepaths" />
         </provider>
+
+        <service
+            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
+            android:enabled="false"
+            android:exported="false">
+            <meta-data
+                android:name="autoStoreLocales"
+                android:value="true" />
+        </service>
+
+        <!-- Configuración USB (Web USB/HID - https://developers.ledger.com/)-->
+        <meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" android:resource="@xml/usb_device_filter" />
+
     </application>
 </manifest>