Fix travis release build (#140)

safe-global · Feb 9, 2018 · 9ab8a0d · 9ab8a0d
1 parent f92e7f0
commit 9ab8a0d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,9 @@ language: android
 
 env:
   global:
-    - secure: "KbShxiN4pBFXZpCG+lNM1prUzsJm+OfaTXk/cJ2rt9PMZ5rt9BHhUHYIwlH59omGF99m9haYTmGEmRHcV3208JylNPkoBYfr+YmtjkIj/bb3Uncn8WCdNX5SfWidi+8hEuRX9be5QK1y3FU/1ZThiWkuTeIVxPdMLSMLqfTW+q4UVz4Ql5JJFJ/bzvjhVCzmWBi0nYbOUf6WUpGimxx5JlKG41RQzxQfNhZtVTbMQKiCyWaBr4nZ5kCwEUAAfaX332UqrvFFhuCOagWeeWgbOZETe1lvqu1IIPxsgSEnb2EHotFNn0ueeGl2XQPfW/U/D8LfNimnjfzO+o41ZJo15SiFbK8p5C3q6XES4zpAl91aGd3b1FJNojUBw6g9bkjOhv0W7NpqFAXxWDJ7hIgxSX3pRwtgDG084CupjuYplO5O+UCulBvR12/MPky9zY0+v6rxmdrHO/CucwraHNccxmBLLjdKW6VFNCuHdvqN5dCsBSWQbjx81/TDC92dixeFwl2h17cfF2fH+4GMms1dx1IU9kHPJMsMExcCQZRyeT0NAdWjS0xWUsh/FgEFkaonIcnB8tLN/DShVsM5CuJDLwAeWqX8SBKVnJHfFKUmrHGcEAZ6TPl24CwjNeuNVaEF2X3PPvNS329mlwIaEemWB7Qo7WkGrb2gED0W5lZgDaQ="
-    - secure: "jB266gWaTubD6rQf7bqy4MRMYbhL1+au3l5IrtzxJJY852wY0eKYttkxZoGJUfmMGtE/JB2d6Y8nXO3tMqk+YjK7GZ5l+TqxYEGj9rjnnummlFRpgpHFScEaSMpg/XDPdI5gFqPhFv3la1ePd9m7eJJl5CKUVjZnkl9LTnGb9KETccg4kr43cHH8KIFGiMwyrXomh8w001V2BiW66zGRdhJxqoHc87iyaxUe28LgvEXBcpRsMvJ33oPybsVDlXXOc+2nmjJltky+UU13xkJwiCUkoJ8e5R5sgR5NsICTOJVn/usPNotIr8jnoPV1v/NCMLVoVzWkNjXm4EWYCFSywDr3Rr1Ur3GuQ67Kb5ACD3hgso2/RGE4opvLMIm3VGM6TDH9S0zoZnKqfBxsSHZ6rI+bcSKXJDuP96AouHCkzMeYIF2pwafdlMuKgAOPpGrNePh0sSHgG+RRbTOBjYcD8SR4oeYJTTg944ixgFxstwogblJTpnHkwBWyKJB2fRckPmz52d3kRNeXKj2J3oPcrpQNpJS++PlmlZcPBOPJLP4PWq9TOQVtzh9TFnwGDgwo0YdDE0G8Z9Mwi+vPR6tcdhZ9eiTyQbRK60Z8ToecOF3Ce/je9MiuTgP3QgrdLR3JSRhVbVQTLgFdDDx8iEuBJfiUG+OvI0MVu5C2/or0mOQ="
-    
+    - secure: "jjkUBOfMEs4AA/F/4NlQj0G67t3WW98NP6RQ27rNSlfE0kyrWnVGNkNZAOauavJ/0JMB1ErmYEi5fGm+9GbXm+CWleUNEmUxHlhubwVtFk8sj5SbOs0xp9fpxk65sLif0zRT3d/3eol1zofpoXASB0WtmrNr4mbMXVSA5JXyM2goqD2Qk2ABk/leE+hxODLAkUhc9roCYslst7IhtZcU55kwx25w0LOaXwtSJfrt51l2OtLv1edcifSSU7JUJRlirvUAX7cpvn/8Jb0lgNzuoXFSsrMja9uXyHJxRa5fNGNM5SgLuZC6jw7FBuEKj2sGUL1OdrOXDi8qZoEOtEvMNTe+qORr+He3Ecq8Bg3ZAF0ZisJ6YETT/Kr7ixySHdsK+xqTvB2yx0QQbPcrACSbqtBiOigyVYaWOz0WFMbnF5aIkGBwUusPPWYmQCn28nSPkvAQsrOyGWBPvnU7zZCFbDaQTVb66TKtM2FT5c3XbsVKuwbJG1K+HdnFfoz+ZxK8En40718+ghRK06mij4iSMnSBqZ8g3cTZXZ6tDE7qpzDFXynIThZE2RtKhGwuC4Cpjl/cZauN0sdBn1FfXtCA8nF04oICltNz0bz+rZjgLAeknIx32P2q4f+g5F1kObBECjfum6StZ9JkdJiTb93bAbqtSDgScexTuAV4cs9KtmE="
+    - secure: "P1ckY6Qafvzvilw0ORiHzmzdDfw+wFxg4PW6/0+kKuaVoM9dbYQuVP5zNHOQXJCAJXAU79mLAePenrv5b65p9UJSNnjJz3yjAj5rKcF+Ynu3qhxSNp4BRQF+KpXBrr1Hz5yHGxA5P9p7Yk11TstU9l2vvQO4TRJYq33gqUfr66wFJRQpT6TMzdrgXn55YX+2/aQM/9dEhDDA3PMnn1haHseMb9wiyrQ9aYYcbcptXNoZnf4i0uzFvuZFLtSxkk/32PPT0r7rZN5jiZd0WmEgZ8cg+BqItNMGOvFxa9U1+NtP6aOMv8fvJTYQAsWj+vtKaNCIcLrr+njKPxAJ4TomwN6CBJgaFGxH+xtGlQw/HtLxrKCWCPEJpZdCGb6iR2x/cS6Juhm7CnrrLDXC68x7aSkaiGQQPqu2cYtahEm3niuBbfYSubVqPqNcQQxcpjftXemlUszlWBSRmkJL7DvUI74djaICz8L6UCNzl4eRsGPztejtp3OJS3/IHYVK0udyKCJfGbyDWFRCiPCkkfhHeJarea/2zzlMCnYx3ZgAiyMD3H6vfmC7S5YdA0Y8KKDQYycQ5+VHq02LoFjycT7k/zvUmidB0umqNfgd2qK4Dz41BU6fjjB/1N3qP3MGlRS8Mg0a68j3hOihbZw21rIqfvIVFeq8BO2Yyd7ferThbvg="
+
 android:
   components:
     - tools

diff --git a/app-core/src/main/java/pm/gnosis/heimdall/data/remote/models/TransactionReceipt.kt b/app-core/src/main/java/pm/gnosis/heimdall/data/remote/models/TransactionReceipt.kt
@@ -1,13 +1,17 @@
 package pm.gnosis.heimdall.data.remote.models
 
+import com.squareup.moshi.Json
 import java.math.BigInteger
 
 
 data class TransactionReceipt(
-        val status: BigInteger?,
-        val transactionHash: String,
-        val contractAddress: String?,
-        val logs: List<Event>
+        @Json(name = "status") val status: BigInteger?,
+        @Json(name = "transactionHash") val transactionHash: String,
+        @Json(name = "contractAddress") val contractAddress: String?,
+        @Json(name = "logs") val logs: List<Event>
 ) {
-    data class Event(val logIndex: BigInteger, val data: String, val topics: List<String>)
+    data class Event(
+            @Json(name = "logIndex")  val logIndex: BigInteger,
+            @Json(name = "data")  val data: String,
+            @Json(name = "topics")  val topics: List<String>)
 }
diff --git a/.../pm/gnosis/heimdall/ui/transactions/details/safe/ViewChangeSafeSettingsDetailsFragment.kt b/.../pm/gnosis/heimdall/ui/transactions/details/safe/ViewChangeSafeSettingsDetailsFragment.kt
@@ -78,20 +78,23 @@ abstract class ViewChangeSafeSettingsDetailsFragment : BaseReviewTransactionDeta
                 layout_view_change_safe_primary_target_label.setText(R.string.old_owner)
                 layout_view_change_safe_primary_target_value.text = action.owner.asEthereumAddressStringOrNull()
                 layout_view_change_safe_primary_target_icon.setAddress(action.owner)
+                layout_view_change_safe_secondary_target_label.visible(false)
                 layout_view_change_safe_secondary_target_container.visible(false)
                 layout_view_change_safe_action.setText(removedOwnerMessage())
             }
             is AddOwner -> {
                 layout_view_change_safe_primary_target_label.setText(R.string.new_owner)
                 layout_view_change_safe_primary_target_value.text = action.owner.asEthereumAddressStringOrNull()
                 layout_view_change_safe_primary_target_icon.setAddress(action.owner)
+                layout_view_change_safe_secondary_target_label.visible(false)
                 layout_view_change_safe_secondary_target_container.visible(false)
                 layout_view_change_safe_action.setText(addedOwnerMessage())
             }
             is ReplaceOwner -> {
                 layout_view_change_safe_primary_target_label.setText(R.string.new_owner)
                 layout_view_change_safe_primary_target_value.text = action.newOwner.asEthereumAddressStringOrNull()
                 layout_view_change_safe_primary_target_icon.setAddress(action.newOwner)
+                layout_view_change_safe_secondary_target_label.visible(true)
                 layout_view_change_safe_secondary_target_container.visible(true)
                 layout_view_change_safe_secondary_target_label.setText(R.string.old_owner)
                 layout_view_change_safe_secondary_target_value.text = action.previousOwner.asEthereumAddressStringOrNull()