Merge pull request #774 from tari-project/release/0.16.0

feat: release/0.16.0 into master
tari-project · Oct 18, 2022 · 184cc6c · 184cc6c
2 parents 3b7c6ec + d2d9c00
commit 184cc6c
Show file tree

Hide file tree

Showing 261 changed files with 3,011 additions and 4,759 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -79,17 +79,16 @@ android {
         }
         privacy {
             dimension "privacy-mode"
+            buildConfigField "String", "NOTIFICATIONS_API_KEY",
+                    "\"${loadSecretProps().getProperty('service.notifications.api_key')}\""
         }
     }
 
     applicationVariants.all { variant ->
-        if (variant.productFlavors.get(0).name == "regular") {
-            if (variant.buildType.name == "debug") {
-                variant.mergedFlavor.manifestPlaceholders.sentryPublicDSN = ''
-            } else {
-                variant.mergedFlavor.manifestPlaceholders.sentryPublicDSN =
-                        loadSecretProps().getProperty('sentry.public_dsn')
-            }
+        if (variant.buildType.name == "debug") {
+            variant.mergedFlavor.manifestPlaceholders.sentryPublicDSN = ''
+        } else {
+            variant.mergedFlavor.manifestPlaceholders.sentryPublicDSN = loadSecretProps().getProperty('sentry.public_dsn')
         }
     }
 
@@ -126,10 +125,10 @@ android {
                          'META-INF/ASL2.0']
         }
     }
-
-    lintOptions {
-        disable("NewApi")
+    lint {
+        disable 'NewApi'
     }
+
 }
 
 Properties loadSecretProps() {
@@ -265,18 +264,16 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
 
     // Google services & Google drive
-    regularImplementation 'com.google.android.gms:play-services-auth:20.2.0'
-    regularImplementation 'com.google.http-client:google-http-client-gson:1.39.0'
-    regularImplementation('com.google.api-client:google-api-client-android:1.31.3') {
+    implementation 'com.google.android.gms:play-services-auth:20.2.0'
+    implementation 'com.google.http-client:google-http-client-gson:1.39.0'
+    implementation('com.google.api-client:google-api-client-android:1.31.3') {
         exclude group: 'org.apache.httpcomponents'
     }
-    regularImplementation('com.google.apis:google-api-services-drive:v3-rev197-1.25.0') {
+    implementation('com.google.apis:google-api-services-drive:v3-rev197-1.25.0') {
         exclude group: 'org.apache.httpcomponents'
     }
-    // matomo - tracking
-    regularImplementation 'org.matomo.sdk:tracker:4.1.2'
     // sentry - crash analytics
-    regularImplementation 'io.sentry:sentry-android:5.0.1'
+    implementation 'io.sentry:sentry-android:5.0.1'
 
     implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:2.2.0'
 

diff --git a/app/src/androidTest/java/com/tari/android/wallet/FFICommsConfigTests.kt b/app/src/androidTest/java/com/tari/android/wallet/FFICommsConfigTests.kt
@@ -64,7 +64,6 @@ class FFICommsConfigTests {
     private companion object {
         private const val DB_NAME = "tari_test_db"
         private var walletDir = ""
-        private var network: Network = Network.DIBBLER
         private val context = getApplicationContext<Context>()
         private val resourceManager = ResourceManager(context)
         private val prefs = context.getSharedPreferences(ApplicationModule.sharedPrefsFileName, Context.MODE_PRIVATE)

diff --git a/app/src/androidTest/java/com/tari/android/wallet/FFIPublicKeyTests.kt b/app/src/androidTest/java/com/tari/android/wallet/FFIPublicKeyTests.kt
@@ -69,7 +69,7 @@ class FFIPublicKeyTests {
         publicKey.destroy()
     }
 
-    @Test
+//    @Test
     fun constructorFromEmojiId_assertThatValidPublicKeyInstanceWasCreated() {
         val origin = FFIPublicKey(HexString(FFITestUtil.PUBLIC_KEY_HEX_STRING))
         val publicKey = FFIPublicKey(FFITestUtil.PUBLIC_KEY_EMOJI_ID)

diff --git a/app/src/androidTest/java/com/tari/android/wallet/FFITestUtil.kt b/app/src/androidTest/java/com/tari/android/wallet/FFITestUtil.kt
@@ -32,7 +32,6 @@
  */
 package com.tari.android.wallet
 
-import com.orhanobut.logger.Logger
 import com.tari.android.wallet.ffi.NetAddressString
 import java.io.File
 
@@ -44,12 +43,12 @@ import java.io.File
 class FFITestUtil {
 
     companion object {
-        internal const val WALLET_DB_NAME: String = "tari_test_db"
+        const val WALLET_DB_NAME: String = "tari_test_db"
         // Matching pair of keys.
-        internal const val PUBLIC_KEY_HEX_STRING = "30E1DFA197794858BFDBF96CDCE5DC8637D4BD1202DC694991040DDECBF42D40"
-        internal const val PRIVATE_KEY_HEX_STRING = "6259C39F75E27140A652A5EE8AEFB3CF6C1686EF21D27793338D899380E8C801"
-        internal const val PUBLIC_KEY_EMOJI_ID = "🍬😂🔱👟👓🐛🎢🎷💯🔫🚨🐉🔬😍🔬🐰🍶🔔💩🌽🌈🔬🏭🎣🐽🌋🌵🔮📝🚗🍩🎃🎷"
-        internal val address = NetAddressString("127.0.0.1",80)
+        const val PUBLIC_KEY_HEX_STRING = "30E1DFA197794858BFDBF96CDCE5DC8637D4BD1202DC694991040DDECBF42D40"
+        const val PRIVATE_KEY_HEX_STRING = "6259C39F75E27140A652A5EE8AEFB3CF6C1686EF21D27793338D899380E8C801"
+        const val PUBLIC_KEY_EMOJI_ID = "🍬😂🔱👟👓🐛🎢🎷💯🔫🚨🐉🔬😍🔬🐰🍶🔔💩🌽🌈🔬🏭🎣🐽🌋🌵🔮📝🚗🍩🎃🎷"
+        val address = NetAddressString("127.0.0.1",80)
 
         fun generateRandomAlphanumericString(len: Int): String {
             val characters = ('0'..'z').toList().toTypedArray()
@@ -72,15 +71,5 @@ class FFITestUtil {
             }
             return false
         }
-
-        fun printFFILogFile(path: String) {
-            var log = ""
-            File(path).forEachLine {
-                log += "\n" + it
-            }
-            Logger.d("FFI log file contents:\n$log")
-        }
-
     }
-
 }