From 1c72cc9adb4131322bf8be550977e950b5691e92 Mon Sep 17 00:00:00 2001 From: smikhalevski Date: Mon, 25 Dec 2023 12:33:07 +0300 Subject: [PATCH 1/2] Deleted deprecated fields --- .../src/main/java/org/racehorse/ActivityPlugin.kt | 5 +---- .../org/racehorse/BiometricEncryptedStoragePlugin.kt | 10 ++-------- .../src/main/java/org/racehorse/DevicePlugin.kt | 5 +---- .../src/main/java/org/racehorse/DownloadPlugin.kt | 5 +---- .../main/java/org/racehorse/EncryptedStoragePlugin.kt | 10 ++-------- .../src/main/java/org/racehorse/GooglePayPlugin.kt | 5 +---- web/racehorse/src/main/createActivityManager.ts | 2 +- .../src/main/createBiometricEncryptedStorageManager.ts | 4 ++-- web/racehorse/src/main/createDeviceManager.ts | 2 +- web/racehorse/src/main/createDownloadManager.ts | 2 +- .../src/main/createEncryptedStorageManager.ts | 8 ++++++-- web/racehorse/src/main/createGooglePayManager.ts | 2 +- 12 files changed, 20 insertions(+), 40 deletions(-) diff --git a/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt b/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt index 5226183f..3934d380 100644 --- a/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt +++ b/android/racehorse/src/main/java/org/racehorse/ActivityPlugin.kt @@ -21,10 +21,7 @@ class GetActivityStateEvent : RequestEvent() { } class GetActivityInfoEvent : RequestEvent() { - class ResultEvent(val info: ActivityInfo) : ResponseEvent() { - @Deprecated("Delete in next release") - val activityInfo = info - } + class ResultEvent(val info: ActivityInfo) : ResponseEvent() } /** diff --git a/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt b/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt index d88c0b31..bf84b642 100644 --- a/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt +++ b/android/racehorse/src/main/java/org/racehorse/BiometricEncryptedStoragePlugin.kt @@ -63,20 +63,14 @@ class GetBiometricEncryptedValueEvent(val key: String, val config: BiometricConf * Checks that the key exists in the storage. */ class HasBiometricEncryptedValueEvent(val key: String) : RequestEvent() { - class ResultEvent(val isExisting: Boolean) : ResponseEvent() { - @Deprecated("Delete in next release") - val exists = isExisting - } + class ResultEvent(val isExisting: Boolean) : ResponseEvent() } /** * Deletes a value associated with the key. */ class DeleteBiometricEncryptedValueEvent(val key: String) : RequestEvent() { - class ResultEvent(val isDeleted: Boolean) : ResponseEvent() { - @Deprecated("Delete in next release") - val deleted = isDeleted - } + class ResultEvent(val isDeleted: Boolean) : ResponseEvent() } /** diff --git a/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt b/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt index 30e7016e..5013ddf3 100644 --- a/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt +++ b/android/racehorse/src/main/java/org/racehorse/DevicePlugin.kt @@ -15,10 +15,7 @@ class Rect(val top: Float = 0f, val right: Float = 0f, val bottom: Float = 0f, v * Get OS and device versions. */ class GetDeviceInfoEvent : RequestEvent() { - class ResultEvent(val info: DeviceInfo) : ResponseEvent() { - @Deprecated("Delete in next release") - val deviceInfo = info - } + class ResultEvent(val info: DeviceInfo) : ResponseEvent() } /** diff --git a/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt b/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt index fee382a6..37d94d2c 100644 --- a/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt +++ b/android/racehorse/src/main/java/org/racehorse/DownloadPlugin.kt @@ -152,10 +152,7 @@ class GetAllDownloadsEvent : RequestEvent() { * longer be accessible through the download manager. If there is a downloaded file, partial or complete, it is deleted. */ class RemoveDownloadEvent(var id: Long) : RequestEvent() { - class ResultEvent(val isRemoved: Boolean) : ResponseEvent() { - @Deprecated("Delete in next release") - val removed = isRemoved - } + class ResultEvent(val isRemoved: Boolean) : ResponseEvent() } open class DownloadPlugin(private val activity: ComponentActivity) { diff --git a/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt b/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt index d73e1f4f..fa198277 100644 --- a/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt +++ b/android/racehorse/src/main/java/org/racehorse/EncryptedStoragePlugin.kt @@ -40,20 +40,14 @@ class GetEncryptedValueEvent(val key: String, val password: String) : RequestEve * Checks that the key exists in the storage. */ class HasEncryptedValueEvent(val key: String) : RequestEvent() { - class ResultEvent(val isExisting: Boolean) : ResponseEvent() { - @Deprecated("Delete in next release") - val exists = isExisting - } + class ResultEvent(val isExisting: Boolean) : ResponseEvent() } /** * Deletes an encrypted value associated with the key. */ class DeleteEncryptedValueEvent(val key: String) : RequestEvent() { - class ResultEvent(val isDeleted: Boolean) : ResponseEvent() { - @Deprecated("Delete in next release") - val deleted = isDeleted - } + class ResultEvent(val isDeleted: Boolean) : ResponseEvent() } /** diff --git a/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt b/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt index 2e61a70a..756a08bb 100644 --- a/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt +++ b/android/racehorse/src/main/java/org/racehorse/GooglePayPlugin.kt @@ -123,10 +123,7 @@ class GooglePayIsTokenizedEvent( * Open Google Pay app and reveal the card. */ class GooglePayViewTokenEvent(val tokenId: String, val tokenServiceProvider: Int) : RequestEvent() { - class ResultEvent(val isOpened: Boolean) : ResponseEvent() { - @Deprecated("Delete in next release") - val opened = isOpened - } + class ResultEvent(val isOpened: Boolean) : ResponseEvent() } /** diff --git a/web/racehorse/src/main/createActivityManager.ts b/web/racehorse/src/main/createActivityManager.ts index ea83c9be..846598f2 100644 --- a/web/racehorse/src/main/createActivityManager.ts +++ b/web/racehorse/src/main/createActivityManager.ts @@ -196,7 +196,7 @@ export function createActivityManager(eventBridge: EventBridge, uiScheduler: Sch return { getActivityState: () => eventBridge.request({ type: 'org.racehorse.GetActivityStateEvent' }).payload.state, - getActivityInfo: () => eventBridge.request({ type: 'org.racehorse.GetActivityInfoEvent' }).payload.activityInfo, + getActivityInfo: () => eventBridge.request({ type: 'org.racehorse.GetActivityInfoEvent' }).payload.info, startActivity: intent => eventBridge.request({ type: 'org.racehorse.StartActivityEvent', payload: { intent } }).payload.isStarted, diff --git a/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts b/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts index 66f1d38d..dc5d9899 100644 --- a/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts +++ b/web/racehorse/src/main/createBiometricEncryptedStorageManager.ts @@ -82,12 +82,12 @@ export function createBiometricEncryptedStorageManager( eventBridge.request({ type: 'org.racehorse.HasBiometricEncryptedValueEvent', payload: { key }, - }).payload.exists, + }).payload.isExisting, delete: key => eventBridge.request({ type: 'org.racehorse.DeleteBiometricEncryptedValueEvent', payload: { key }, - }).payload.deleted, + }).payload.isDeleted, }; } diff --git a/web/racehorse/src/main/createDeviceManager.ts b/web/racehorse/src/main/createDeviceManager.ts index fcb2c7fe..756c2d27 100644 --- a/web/racehorse/src/main/createDeviceManager.ts +++ b/web/racehorse/src/main/createDeviceManager.ts @@ -86,7 +86,7 @@ export function createDeviceManager(eventBridge: EventBridge): DeviceManager { eventBridge.request({ type: 'org.racehorse.GetPreferredLocalesEvent' }).payload.locales; return { - getDeviceInfo: () => eventBridge.request({ type: 'org.racehorse.GetDeviceInfoEvent' }).payload.deviceInfo, + getDeviceInfo: () => eventBridge.request({ type: 'org.racehorse.GetDeviceInfoEvent' }).payload.info, getPreferredLocales, diff --git a/web/racehorse/src/main/createDownloadManager.ts b/web/racehorse/src/main/createDownloadManager.ts index 2de1069c..9e911caa 100644 --- a/web/racehorse/src/main/createDownloadManager.ts +++ b/web/racehorse/src/main/createDownloadManager.ts @@ -262,6 +262,6 @@ export function createDownloadManager(eventBridge: EventBridge): DownloadManager getAllDownloads: () => eventBridge.request({ type: 'org.racehorse.GetAllDownloadsEvent' }).payload.downloads, removeDownload: id => - eventBridge.request({ type: 'org.racehorse.RemoveDownloadEvent', payload: { id } }).payload.removed, + eventBridge.request({ type: 'org.racehorse.RemoveDownloadEvent', payload: { id } }).payload.isRemoved, }; } diff --git a/web/racehorse/src/main/createEncryptedStorageManager.ts b/web/racehorse/src/main/createEncryptedStorageManager.ts index c6b330b6..77e60ae5 100644 --- a/web/racehorse/src/main/createEncryptedStorageManager.ts +++ b/web/racehorse/src/main/createEncryptedStorageManager.ts @@ -43,12 +43,16 @@ export function createEncryptedStorageManager(eventBridge: EventBridge): Encrypt .requestAsync({ type: 'org.racehorse.GetEncryptedValueEvent', payload: { key, password } }) .then(event => event.payload.value), - has: key => eventBridge.request({ type: 'org.racehorse.HasEncryptedValueEvent', payload: { key } }).payload.exists, + has: key => + eventBridge.request({ + type: 'org.racehorse.HasEncryptedValueEvent', + payload: { key }, + }).payload.isExisting, delete: key => eventBridge.request({ type: 'org.racehorse.DeleteEncryptedValueEvent', payload: { key }, - }).payload.deleted, + }).payload.isDeleted, }; } diff --git a/web/racehorse/src/main/createGooglePayManager.ts b/web/racehorse/src/main/createGooglePayManager.ts index 85eadd05..c2628c6a 100644 --- a/web/racehorse/src/main/createGooglePayManager.ts +++ b/web/racehorse/src/main/createGooglePayManager.ts @@ -329,7 +329,7 @@ export function createGooglePayManager(eventBridge: EventBridge, uiScheduler: Sc type: 'org.racehorse.GooglePayViewTokenEvent', payload: { tokenId, tokenServiceProvider }, }) - .then(event => event.payload.opened) + .then(event => event.payload.isOpened) ), pushTokenize: request => From e501128cd90bf581b67f23fdad6221a8c0cc9cfc Mon Sep 17 00:00:00 2001 From: smikhalevski Date: Tue, 26 Dec 2023 14:21:34 +0300 Subject: [PATCH 2/2] Better naming --- web/example/src/examples/ActivityExample.tsx | 8 ++++---- .../examples/BiometricEncryptedStorageExample.tsx | 4 ++-- web/example/src/examples/BiometricExample.tsx | 6 +++--- web/example/src/examples/DeviceExample.tsx | 8 ++++---- web/example/src/examples/EncryptedStorageExample.tsx | 4 ++-- web/example/src/examples/FileInputExample.tsx | 4 +++- web/example/src/examples/GoogleSignInExample.tsx | 4 +++- web/example/src/examples/NotificationsExample.tsx | 8 +++++--- web/racehorse/src/main/createScheduler.ts | 12 ++++++------ 9 files changed, 32 insertions(+), 26 deletions(-) diff --git a/web/example/src/examples/ActivityExample.tsx b/web/example/src/examples/ActivityExample.tsx index f2ffd830..4ebfca1d 100644 --- a/web/example/src/examples/ActivityExample.tsx +++ b/web/example/src/examples/ActivityExample.tsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useEffect, useMemo, useState } from 'react'; import { activityManager, ActivityResult, ActivityState, Intent, permissionsManager } from 'racehorse'; import { FormattedJSON } from '../components/FormattedJSON'; import { useActivityState } from '@racehorse/react'; @@ -11,7 +11,7 @@ const activityStateLabel = { export function ActivityExample() { const activityState = useActivityState(); - const [activityInfo] = useState(activityManager.getActivityInfo); + const activityInfo = useMemo(activityManager.getActivityInfo, []); const [contactActivityResult, setContactActivityResult] = useState(); useEffect( @@ -57,8 +57,8 @@ export function ActivityExample() { {' '} {' '}