Merge branch 'release/0.4.1'

README.md

@@ -35,7 +35,7 @@ allprojects {
 In your application `build.gradle` file, add:
 
 ```groovy
-def uport_sdk_version = "v0.4.0"
+def uport_sdk_version = "v0.4.1"
 dependencies {
     //...
     // core SDK
@@ -222,6 +222,8 @@ Want to contribute to uport-android-sdk? Cool, please read our [contribution gui
 
 
 ## Changelog
+* 0.4.1
+    * maintenance release
 
 * 0.4.0
     * `core` module is a simple java library (and can be used as a dependency in JVM tests)

build.gradle

@@ -40,7 +40,7 @@ buildscript {
         khex_version = "0.5"
         tweetnacl_k_version = "0.0.1"
 
-        uport_sdk_version = "v0.4.0"
+        uport_sdk_version = "v0.4.1"
     }
 
     repositories {

credentials/src/main/java/me/uport/sdk/credentials/EthereumTransactionRequestParams.kt

@@ -2,7 +2,6 @@
 
 package me.uport.sdk.credentials
 
-import org.kethereum.extensions.toHexStringNoPrefix
 import org.kethereum.extensions.toHexStringZeroPadded
 import java.math.BigInteger
 

demoapp/build.gradle

@@ -54,6 +54,7 @@ dependencies {
     androidTestImplementation "com.android.support.test:rules:$test_runner_version"
     androidTestImplementation "com.android.support.test.espresso:espresso-core:$espresso_version"
     androidTestImplementation "com.android.support.test.espresso:espresso-intents:$espresso_version"
+    androidTestImplementation "com.android.support.test.espresso:espresso-contrib:$espresso_version"
     androidTestImplementation "io.mockk:mockk-android:$mockk_version"
     androidTestImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertk_version"
 }

demoapp/src/androidTest/java/me/uport/sdk/demoapp/CreateAccountTest.kt

@@ -17,6 +17,9 @@ class CreateAccountTest {
 
     @Test
     fun accountIsCreated() {
+
+        Thread.sleep(2000)
+
         onView(withId(R.id.defaultAccountView)).check(matches(withText(not(containsString("ERROR")))))
     }
 

demoapp/src/androidTest/java/me/uport/sdk/demoapp/PersonalSignatureTest.kt

@@ -0,0 +1,67 @@
+package me.uport.sdk.demoapp
+
+import android.app.Activity
+import android.app.Instrumentation
+import android.content.Intent
+import android.content.IntentFilter
+import android.support.test.InstrumentationRegistry
+import android.support.test.espresso.Espresso.onView
+import android.support.test.espresso.action.ViewActions.click
+import android.support.test.espresso.assertion.ViewAssertions.matches
+import android.support.test.espresso.intent.Intents.intending
+import android.support.test.espresso.intent.matcher.IntentMatchers.hasAction
+import android.support.test.espresso.intent.rule.IntentsTestRule
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
+import me.uport.sdk.demoapp.request_flows.PersonalSignRequestActivity
+import me.uport.sdk.transport.RequestDispatchActivity
+import org.hamcrest.CoreMatchers.not
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class PersonalSignatureTest {
+
+    @get:Rule
+    val intentsTestRule = IntentsTestRule(PersonalSignRequestActivity::class.java)
+
+    private var instrumentation: Instrumentation? = null
+    private var monitor: Instrumentation.ActivityMonitor? = null
+    private val filter: IntentFilter? = null
+
+    @Before
+    fun run_before_every_test() {
+        instrumentation = InstrumentationRegistry.getInstrumentation()
+        monitor = instrumentation?.addMonitor(filter, null, true)
+    }
+
+    @After
+    fun run_after_every_test() {
+        instrumentation?.removeMonitor(monitor)
+    }
+
+    @Before
+    fun stub_intent() {
+        // Mock the ActivityResult to be returned to PersonalSignRequestActivity in onActivityResult.
+        val resultData = Intent()
+        val redirectUri = "https://uport-project.github.io/uport-android-sdk/callbacks#personalSig=eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NkstUiJ9.eyJpYXQiOjE1NTI0ODczMjIsImV4cCI6MTU1MjU3MzcyMiwidHlwZSI6InBlcnNvbmFsU2lnblJlc3AiLCJkYXRhIjoiVGhpcyBpcyBhIG1lc3NhZ2UgSSBuZWVkIHlvdSB0byBzaWduIiwic2lnbmF0dXJlIjp7InYiOjI3LCJyIjoiMHgzYjExMmUxMzZiMDI3MDZiNzNjZjhjYjFmNDI0ZDBjZjg1NWExZTM5OTU0ZGM3OTJjZTllYzFmNDkwZmJlZjBiIiwicyI6IjB4N2U0YTViMWU4MWM4YjNjZjJkMTY1ODdjNTUwMjUyNmNjOTM3OWU4OWUwOWI2NTNlMWI2NWUzOThkYzg5MjBjNiJ9LCJpc3MiOiJkaWQ6ZXRocjoweDNmZjI1MTE3YzBlMTcwY2E1MzBiZDU4OTE4OTljMTgzOTQ0ZGI0MzEifQ.5FtBavglhq1aeMtTM644cY5d1ij-0QvlMMLMQhmwVpUtCKOJRBjj3psXrPPuEm28_ZqAV0ISTyH7a2w1osjyzgE"
+        resultData.putExtra("redirect_uri", redirectUri)
+        val response = Instrumentation.ActivityResult(Activity.RESULT_OK, resultData)
+
+        // This sets up what the ActivityResult to be returned whenever an intent with the below action is launched
+        intending(hasAction(RequestDispatchActivity.ACTION_DISPATCH_REQUEST)).respondWith(response)
+    }
+
+    @Test
+    fun data_successfully_signed_by_uport_account() {
+
+        // User clicks on send request.
+        onView(withId(R.id.send_request)).perform(click())
+
+        Thread.sleep(5000)
+
+        // Response detail TextView will no longer be empty
+        onView(withId(R.id.response_details)).check(matches(not(withText(""))))
+    }
+}

demoapp/src/androidTest/java/me/uport/sdk/demoapp/SignJWTUportHDTest.kt

@@ -1,8 +1,5 @@
 package me.uport.sdk.demoapp
 
-import android.support.test.espresso.Espresso.onView
-import android.support.test.espresso.action.ViewActions.click
-import android.support.test.espresso.matcher.ViewMatchers.withId
 import android.support.test.rule.ActivityTestRule
 import assertk.assert
 import assertk.assertions.isNotEqualTo
@@ -16,10 +13,10 @@ class SignJWTUportHDTest {
     val activityRule = ActivityTestRule(SignJWTUportHDSignerActivity::class.java)
 
     @Test
-    fun keyIsCreated() {
+    fun signerIsCreated() {
 
-        onView(withId(R.id.submit_btn_one)).perform(click())
+        Thread.sleep(1000)
 
-        assert(activityRule.activity.issuerDID).isNotEqualTo("null")
+        assert(activityRule.activity.issuerDID).isNotEqualTo("")
     }
 }

demoapp/src/androidTest/java/me/uport/sdk/demoapp/TransactionRequestTest.kt

@@ -0,0 +1,66 @@
+package me.uport.sdk.demoapp
+
+import android.app.Activity
+import android.app.Instrumentation
+import android.content.Intent
+import android.content.IntentFilter
+import android.support.test.InstrumentationRegistry
+import android.support.test.espresso.Espresso.onView
+import android.support.test.espresso.action.ViewActions.click
+import android.support.test.espresso.assertion.ViewAssertions.matches
+import android.support.test.espresso.intent.Intents.intending
+import android.support.test.espresso.intent.matcher.IntentMatchers.hasAction
+import android.support.test.espresso.intent.rule.IntentsTestRule
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
+import me.uport.sdk.demoapp.request_flows.EthereumTransactionActivity
+import me.uport.sdk.transport.RequestDispatchActivity
+import org.hamcrest.CoreMatchers.not
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class TransactionRequestTest {
+
+    @get:Rule
+    val intentsTestRule = IntentsTestRule(EthereumTransactionActivity::class.java)
+
+    private var instrumentation: Instrumentation? = null
+    private var monitor: Instrumentation.ActivityMonitor? = null
+    private val filter: IntentFilter? = null
+
+    @Before
+    fun run_before_every_test() {
+        instrumentation = InstrumentationRegistry.getInstrumentation()
+        monitor = instrumentation?.addMonitor(filter, null, true)
+    }
+
+    @After
+    fun run_after_every_test() {
+        instrumentation?.removeMonitor(monitor)
+    }
+
+    @Before
+    fun stub_intent() {
+        // Mock the ActivityResult to be returned to EthereumTransactionActivity in onActivityResult.
+        val resultData = Intent()
+        val redirectUri = "https://uport-project.github.io/uport-android-sdk/callbacks#tx=6146ccf6a66d994f7c363db875e31ca35581450a4bf6d3be6cc9ac79233a69d0"
+        resultData.putExtra("redirect_uri", redirectUri)
+        val response = Instrumentation.ActivityResult(Activity.RESULT_OK, resultData)
+
+        // This sets up what the ActivityResult to be returned whenever an intent with the below action is launched
+        intending(hasAction(RequestDispatchActivity.ACTION_DISPATCH_REQUEST)).respondWith(response)
+    }
+
+    @Test
+    fun transaction_request_successfully_approved_by_uport_account() {
+        // User clicks on send request.
+        onView(withId(R.id.send_request)).perform(click())
+
+        Thread.sleep(5000)
+
+        // Response detail TextView will no longer be empty
+        onView(withId(R.id.response_details)).check(matches(not(withText(""))))
+    }
+}

demoapp/src/androidTest/java/me/uport/sdk/demoapp/TypedDataTests.kt

@@ -0,0 +1,67 @@
+package me.uport.sdk.demoapp
+
+import android.app.Activity
+import android.app.Instrumentation
+import android.content.Intent
+import android.content.IntentFilter
+import android.support.test.InstrumentationRegistry
+import android.support.test.espresso.Espresso.onView
+import android.support.test.espresso.action.ViewActions.click
+import android.support.test.espresso.assertion.ViewAssertions.matches
+import android.support.test.espresso.intent.Intents.intending
+import android.support.test.espresso.intent.matcher.IntentMatchers.hasAction
+import android.support.test.espresso.intent.rule.IntentsTestRule
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
+import me.uport.sdk.demoapp.request_flows.TypedDataRequestActivity
+import me.uport.sdk.transport.RequestDispatchActivity
+import org.hamcrest.CoreMatchers.not
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+
+class TypedDataTests {
+
+    @get:Rule
+    val intentsTestRule = IntentsTestRule(TypedDataRequestActivity::class.java)
+
+    private var instrumentation: Instrumentation? = null
+    private var monitor: Instrumentation.ActivityMonitor? = null
+    private val filter: IntentFilter? = null
+
+    @Before
+    fun run_before_every_test() {
+        instrumentation = InstrumentationRegistry.getInstrumentation()
+        monitor = instrumentation?.addMonitor(filter, null, true)
+    }
+
+    @After
+    fun run_after_every_test() {
+        instrumentation?.removeMonitor(monitor)
+    }
+
+    @Before
+    fun stub_intent() {
+        // Mock the ActivityResult to be returned to TypedDataRequestActivity in onActivityResult.
+        val resultData = Intent()
+        val redirectUri = "https://uport-project.github.io/uport-android-sdk/callbacks#typedDataSig=eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NkstUiJ9.eyJpYXQiOjE1NTI0ODk1NDEsImV4cCI6MTU1MjU3NTk0MSwidHlwZSI6ImVpcDcxMlJlc3AiLCJyZXF1ZXN0Ijp7InR5cGVzIjp7IkVJUDcxMkRvbWFpbiI6W3sibmFtZSI6Im5hbWUiLCJ0eXBlIjoic3RyaW5nIn0seyJuYW1lIjoidmVyc2lvbiIsInR5cGUiOiJzdHJpbmcifSx7Im5hbWUiOiJjaGFpbklkIiwidHlwZSI6InVpbnQyNTYifSx7Im5hbWUiOiJ2ZXJpZnlpbmdDb250cmFjdCIsInR5cGUiOiJhZGRyZXNzIn1dLCJQZXJzb24iOlt7Im5hbWUiOiJuYW1lIiwidHlwZSI6InN0cmluZyJ9LHsibmFtZSI6IndhbGxldCIsInR5cGUiOiJhZGRyZXNzIn1dLCJNYWlsIjpbeyJuYW1lIjoiZnJvbSIsInR5cGUiOiJQZXJzb24ifSx7Im5hbWUiOiJ0byIsInR5cGUiOiJQZXJzb24ifSx7Im5hbWUiOiJjb250ZW50cyIsInR5cGUiOiJzdHJpbmcifV19LCJkb21haW4iOnsibmFtZSI6IkV0aGVyIE1haWwiLCJ2ZXJzaW9uIjoiMSIsImNoYWluSWQiOiIxIiwidmVyaWZ5aW5nQ29udHJhY3QiOiIweENjQ0NjY2NjQ0NDQ2NDQ0NDQ0NjQ2NDY2NDY0NDQ2NDY2NjY2NjY0MifSwibWVzc2FnZSI6eyJjb250ZW50cyI6IkhlbGxvIEJvYiIsImZyb20iOnsibmFtZSI6IkNvdyIsIndhbGxldCI6IjB4Q0QyYTNkOUY5MzhFMTNDRDk0N0VjMDVBYkM3RkU3MzREZjhERDgyNiJ9LCJ0byI6eyJuYW1lIjoidG8iLCJ3YWxsZXQiOiIweGJCYkJCQkJiYkJCQmJiYkJiYkJiYmJiQkJiQmJiYmJCYkJiYkJCYkIifX0sInByaW1hcnlUeXBlIjoiTWFpbCJ9LCJzaWduYXR1cmUiOnsidiI6MjgsInIiOiIweDlkZjliMDBiOTJiMzYwZDM0NDU2MTg5MDc1MzQ3NzhhOWU1MGRiMDY5ZmQ4NGNmODJiNThmYTFhN2YzNjBkZTUiLCJzIjoiMHg1YjQyOGE2MjVkNDAxZjdmMzQ1N2YxYzk1YjM5MzQ5NTBlZjI3M2JhNjY5MTY3MzNhZGNjYWIyMGEwYTA3YzUxIn0sImlzcyI6ImRpZDpldGhyOjB4M2ZmMjUxMTdjMGUxNzBjYTUzMGJkNTg5MTg5OWMxODM5NDRkYjQzMSJ9.kEwFlT-hQF0eAhv9uS0A_qmc13J0-w3nTjk6ZMbVWOhxGqp_4HKzfYKJuHyKsWJKq2NMzX2jVcvx7Thfqnrc7wE"
+        resultData.putExtra("redirect_uri", redirectUri)
+        val response = Instrumentation.ActivityResult(Activity.RESULT_OK, resultData)
+
+        // This sets up what the ActivityResult to be returned whenever an intent with the below action is launched
+        intending(hasAction(RequestDispatchActivity.ACTION_DISPATCH_REQUEST)).respondWith(response)
+    }
+
+    @Test
+    fun typed_data_successfully_signed_by_uport_account() {
+
+        // User clicks on send request.
+        onView(withId(R.id.send_request)).perform(click())
+
+        Thread.sleep(5000)
+
+        // Response detail TextView will no longer be empty
+        onView(withId(R.id.response_details)).check(matches(not(withText(""))))
+    }
+}