Merge pull request #111 from realifetech/feature/AVF-89

Feature/avf 89
realifetech · Jul 4, 2023 · 0cfc0f8 · 0cfc0f8
2 parents 2e47363 + 1064aff
commit 0cfc0f8
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/.scripts/fetchGraphQlSchema.sh b/.scripts/fetchGraphQlSchema.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 TOKEN=$(echo "$1")
-./gradlew :sdk:downloadApolloSchema -Pcom.apollographql.apollo.endpoint='https://staging-graphql-eu.realifetech.com/' -Pcom.apollographql.apollo.schema='src/main/graphql/com/realifetech/schema.json' --header="Authorization: Bearer NGZjZjViZDE2YTk5MjU1YzJlMzk3MDYxYzhmZjc4MzBlMDQxYzg2MjYwMTNmYTAwY2IyMzI4NzlkNWI3YzEzNw"
+./gradlew :sdk:downloadApolloSchema -Pcom.apollographql.apollo.endpoint='https://staging-graphql-eu.realifetech.com/' -Pcom.apollographql.apollo.schema='src/main/graphql/com/realifetech/schema.json' --header="Authorization: Bearer ZDkxYmY1MjgxYjM3MWQ0ZDY4YjNkMTI5NTRiY2YwYTU5M2RmZmQ4ZGU2OWZjMjIzNjNhMjU5MzA0MGExZmQ2Zg"
diff --git a/sdk/sdk.properties b/sdk/sdk.properties
@@ -2,7 +2,7 @@
 #Mon May 08 11:29:53 CLT 2023
 sdk.buildmeta=
 sdk.major=2
-sdk.minor=3
-sdk.patch=1
+sdk.minor=4
+sdk.patch=0
 sdk.prerelease=
-sdk.semver=
+sdk.semver=2.4.0
diff --git a/sdk/src/main/graphql/com/realifetech/FragmentTicket.graphql b/sdk/src/main/graphql/com/realifetech/FragmentTicket.graphql
@@ -38,4 +38,5 @@ fragment FragmentTicket on Ticket {
         value
     }
     printed
+    timezone
 }
diff --git a/sdk/src/main/graphql/com/realifetech/schema.json b/sdk/src/main/graphql/com/realifetech/schema.json
diff --git a/sdk/src/main/java/com/realifetech/sdk/access/data/model/Ticket.kt b/sdk/src/main/java/com/realifetech/sdk/access/data/model/Ticket.kt
@@ -35,7 +35,8 @@ data class Ticket(
     val redeemerEmail: String?,
     val sharerEmail: String?,
     val additionalFields: MutableList<AdditionalField?>?,
-    val printed: Boolean?
+    val printed: Boolean?,
+    val timezone: String?
 ) : Parcelable
 
 
diff --git a/sdk/src/main/java/com/realifetech/sdk/access/data/model/TicketExtensions.kt b/sdk/src/main/java/com/realifetech/sdk/access/data/model/TicketExtensions.kt
@@ -34,7 +34,8 @@ val FragmentTicket.asModel: Ticket
         redeemerEmail = redeemerEmail,
         sharerEmail = sharerEmail,
         additionalFields = additionalFields?.map { it?.asModel }?.toMutableList(),
-        printed = printed
+        printed = printed,
+        timezone = timezone
     )
 
 val FragmentTicket.Currency.asModel: Currency

diff --git a/sdk/src/main/java/com/realifetech/sdk/general/data/PhysicalDeviceInfo.kt b/sdk/src/main/java/com/realifetech/sdk/general/data/PhysicalDeviceInfo.kt
@@ -3,6 +3,7 @@ package com.realifetech.sdk.general.data
 import android.bluetooth.BluetoothAdapter
 import android.content.Context
 import android.os.Build
+import android.provider.Settings
 import android.util.DisplayMetrics
 import com.realifetech.sdk.core.data.database.preferences.configuration.ConfigurationStorage
 import com.realifetech.sdk.core.utils.isWifiConnected
@@ -24,7 +25,7 @@ open class PhysicalDeviceInfo @Inject constructor(
     }
 
     override val deviceId: String
-        get() = UUID.randomUUID().toString() + ":" + context.packageName
+        get() = Settings.Secure.getString(context.contentResolver, Settings.Secure.ANDROID_ID) + ":" + context.packageName
 
     override val appVersionName: String
         get() = configurationStorage.appVersion