Skip to content

Commit dbd6877

Browse files
DaVinci9196DaVinci9196
authored
Fixed crashed due to empty ApiMetadata parameters (#3202)
1 parent 3ba2133 commit dbd6877

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

‎play-services-core/src/main/kotlin/com/google/android/gms/locationsharingreporter/service/LocationSharingReporterApiService.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@ class LocationSharingReporterApiServiceImpl(
9393
) : ILocationSharingReporterService.Stub(), LifecycleOwner {
9494
private val activePermissionRequestLock = Mutex()
9595

96-
override fun uploadLocation(callback: ILocationUploadCallbacks, account: Account, request: LocationUploadRequest, apiMetadata: ApiMetadata) {
96+
override fun uploadLocation(callback: ILocationUploadCallbacks, account: Account, request: LocationUploadRequest, apiMetadata: ApiMetadata?) {
9797
Log.d(TAG, "Not yet implemented: uploadLocation called with account: ${account.name}")
9898
}
9999

100-
override fun getReportingStatus(callback: ILocationReportingStatusCallbacks, account: Account, apiMetadata: ApiMetadata) {
100+
override fun getReportingStatus(callback: ILocationReportingStatusCallbacks, account: Account, apiMetadata: ApiMetadata?) {
101101
Log.d(TAG, "Not yet implemented: getReportingStatus called with account: ${account.name}")
102102
}
103103

104-
override fun syncReportingStatus(callback: IStatusCallback, account: Account, apiMetadata: ApiMetadata) {
104+
override fun syncReportingStatus(callback: IStatusCallback, account: Account, apiMetadata: ApiMetadata?) {
105105
Log.d(TAG, "Not yet implemented: syncReportingStatus called with account: ${account.name}")
106106
}
107107

108-
override fun periodicLocationUpload(callback: IStatusCallback, account: Account, request: PeriodicLocationUploadRequest, apiMetadata: ApiMetadata) {
108+
override fun periodicLocationUpload(callback: IStatusCallback, account: Account, request: PeriodicLocationUploadRequest, apiMetadata: ApiMetadata?) {
109109
Log.d(TAG, "Not yet implemented: periodicLocationUpload called with account: ${account.name}, request: $request")
110110
}
111111

112-
override fun startLocationReporting(callback: IStatusCallback, account: Account, request: StartLocationReportingRequest, apiMetadata: ApiMetadata) {
112+
override fun startLocationReporting(callback: IStatusCallback, account: Account, request: StartLocationReportingRequest, apiMetadata: ApiMetadata?) {
113113
Log.d(TAG, "startLocationReporting called with account: ${account.name}, request: $request")
114114
try {
115115
validateGoogleAccount(account)
@@ -188,7 +188,7 @@ class LocationSharingReporterApiServiceImpl(
188188
context.startActivity(intent)
189189
}
190190

191-
override fun stopLocationReporting(callback: IStatusCallback?, account: Account, request: StopLocationReportingRequest, apiMetadata: ApiMetadata) {
191+
override fun stopLocationReporting(callback: IStatusCallback?, account: Account, request: StopLocationReportingRequest, apiMetadata: ApiMetadata?) {
192192
Log.d(TAG, "stopLocationReporting called with account: ${account.name}, request: $request")
193193

194194
lifecycleScope.launch(Dispatchers.IO) {
@@ -210,7 +210,7 @@ class LocationSharingReporterApiServiceImpl(
210210
}
211211
}
212212

213-
override fun updateNoticeState(callback: IStatusCallback?, account: Account, request: NoticeAckedUpdateRequest, apiMetadata: ApiMetadata) {
213+
override fun updateNoticeState(callback: IStatusCallback?, account: Account, request: NoticeAckedUpdateRequest, apiMetadata: ApiMetadata?) {
214214
Log.d(TAG, "updateNoticeState called with account: ${account.name}, request: $request")
215215
try {
216216
callback?.onResult(Status.SUCCESS)
@@ -223,7 +223,7 @@ class LocationSharingReporterApiServiceImpl(
223223
}
224224
}
225225

226-
override fun getReportingIssues(callback: ILocationReportingIssuesCallback, account: Account, apiMetadata: ApiMetadata) {
226+
override fun getReportingIssues(callback: ILocationReportingIssuesCallback, account: Account, apiMetadata: ApiMetadata?) {
227227
Log.d(TAG, "getReportingIssues called with account: ${account.name}")
228228
try {
229229
updateDeviceLocationSettingState(context)

‎play-services-tapandpay/core/src/main/kotlin/org/microg/gms/tapandpay/TapAndPayService.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ class TapAndPayImpl(private val context: Context, private val packageName: Strin
131131
callbacks?.onSetSelectedTokenResponse(Status.SUCCESS)
132132
}
133133

134-
override fun getAllCards(request: GetAllCardsRequest?, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
134+
override fun getAllCards(request: GetAllCardsRequest?, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
135135
Log.d(TAG, "getAllCards()")
136136
callbacks.onGetAllCardsResponse(Status.SUCCESS, GetAllCardsResponse(emptyArray(), null, null, null, SparseArray(), ByteArray(0)))
137137
}
138138

139-
override fun setActiveAccount(request: SetActiveAccountRequest?, callbacks: ITapAndPayServiceCallbacks?, metadata: ApiMetadata) {
139+
override fun setActiveAccount(request: SetActiveAccountRequest?, callbacks: ITapAndPayServiceCallbacks?, metadata: ApiMetadata?) {
140140
if (!isFirstParty) {
141141
callbacks?.onSetActiveAccountResponse(Status.INTERNAL_ERROR)
142142
return
@@ -147,7 +147,7 @@ class TapAndPayImpl(private val context: Context, private val packageName: Strin
147147
callbacks?.onSetActiveAccountResponse(Status.SUCCESS)
148148
}
149149

150-
override fun getActiveAccount(request: GetActiveAccountRequest?, callbacks: ITapAndPayServiceCallbacks?, metadata: ApiMetadata) {
150+
override fun getActiveAccount(request: GetActiveAccountRequest?, callbacks: ITapAndPayServiceCallbacks?, metadata: ApiMetadata?) {
151151
if (!isFirstParty) {
152152
callbacks?.onGetActiveAccountResponse(Status.INTERNAL_ERROR, null)
153153
return
@@ -157,7 +157,7 @@ class TapAndPayImpl(private val context: Context, private val packageName: Strin
157157
callbacks?.onGetActiveAccountResponse(Status.SUCCESS, GetActiveAccountResponse(accountInfo))
158158
}
159159

160-
override fun registerDataChangedListener(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
160+
override fun registerDataChangedListener(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
161161
Log.d(TAG, "registerDataChangedListener()")
162162
callbacks.onStatus(Status.SUCCESS)
163163
}
@@ -171,12 +171,12 @@ class TapAndPayImpl(private val context: Context, private val packageName: Strin
171171
callbacks?.onIsDeviceUnlockedForPaymentResponse(Status.SUCCESS, true)
172172
}
173173

174-
override fun getActiveWalletId(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
174+
override fun getActiveWalletId(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
175175
Log.d(TAG, "getActiveWalletId: ")
176176
callbacks.onGetActiveWalletIdResponse(Status(TAP_AND_PAY_NO_ACTIVE_WALLET), "")
177177
}
178178

179-
override fun getTokenStatus(tokenProvider: Int, issuerTokenId: String, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
179+
override fun getTokenStatus(tokenProvider: Int, issuerTokenId: String, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
180180
Log.d(TAG, "getTokenStatus($tokenProvider, $issuerTokenId)")
181181
callbacks.onGetTokenStatusResponse(Status(TAP_AND_PAY_NO_ACTIVE_WALLET), null)
182182
}
@@ -191,7 +191,7 @@ class TapAndPayImpl(private val context: Context, private val packageName: Strin
191191
callbacks?.onHandleStatusPendingIntent(Status(CommonStatusCodes.RESOLUTION_REQUIRED, null, ), Bundle.EMPTY)
192192
}
193193

194-
override fun getStableHardwareId(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
194+
override fun getStableHardwareId(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
195195
Log.d(TAG, "getStableHardwareId()")
196196
callbacks.onGetStableHardwareIdResponse(Status.SUCCESS, "")
197197
}
@@ -206,12 +206,12 @@ class TapAndPayImpl(private val context: Context, private val packageName: Strin
206206
callbacks?.onGetSecurityParamsResponse(Status.SUCCESS, GetSecurityParamsResponse(isDeviceSecure, false, false, false))
207207
}
208208

209-
override fun refreshSeCards(request: RefreshSeCardsRequest?, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
209+
override fun refreshSeCards(request: RefreshSeCardsRequest?, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
210210
Log.d(TAG, "refreshSeCards()")
211211
callbacks.onRefreshSeCardsResponse(Status.SUCCESS, RefreshSeCardsResponse())
212212
}
213213

214-
override fun listTokensDefault(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
214+
override fun listTokensDefault(callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
215215
listTokens(ListTokensRequest(), callbacks, metadata)
216216
}
217217

@@ -234,7 +234,7 @@ class TapAndPayImpl(private val context: Context, private val packageName: Strin
234234
callbacks?.onStatus(Status.SUCCESS)
235235
}
236236

237-
override fun listTokens(request: ListTokensRequest?, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata) {
237+
override fun listTokens(request: ListTokensRequest?, callbacks: ITapAndPayServiceCallbacks, metadata: ApiMetadata?) {
238238
Log.d(TAG, "listTokens($request)")
239239
callbacks.onListTokensResponse(Status.SUCCESS, emptyArray())
240240
}

0 commit comments

Comments
 (0)