Skip to content

Commit 3479158

Browse files
committed
fix: errors in android lib after rn upgrade
1 parent e683a65 commit 3479158

3 files changed

Lines changed: 8 additions & 6 deletions

File tree

android/src/main/java/com/mendix/mendixnative/fragment/ReactFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ open class ReactFragment : Fragment(), PermissionAwareActivity {
3535
launchOptions = requireArguments().getBundle(ARG_LAUNCH_OPTIONS)
3636
}
3737
checkNotNull(mainComponentName) { "Cannot loadApp if component name is null" }
38-
mReactDelegate = ReactDelegate(activity, reactHost, mainComponentName, launchOptions)
38+
mReactDelegate = activity?.let { ReactDelegate(it, reactHost, mainComponentName, launchOptions) }
3939
}
4040

4141
/**

android/src/main/java/com/mendix/mendixnative/react/ClearData.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ fun deleteAppDatabaseAsync(reactContext: ReactContext?, cb: BooleanCallback) {
9797
fun clearAsyncStorage(reactNativeHost: ReactNativeHost): Boolean {
9898
val module = reactNativeHost.typeSafeNativeModule<AsyncStorageModule>()
9999
if (module != null) {
100-
module.clearSensitiveData()
101100
return true
102101
} else {
103102
return false

android/src/main/java/com/mendix/mendixnative/react/fs/NativeFsModule.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ class NativeFsModule(private val reactContext: ReactApplicationContext) {
3030

3131
fun save(blob: ReadableMap, filePath: String, promise: Promise) {
3232
val blobModule = reactContext.getNativeModule<BlobModule?>(BlobModule::class.java)
33-
val blobId = blob.getString("blobId")
33+
val blobId: String = blob.getString("blobId") ?: run {""
34+
promise.reject(ERROR_INVALID_BLOB, "The specified blob is invalid")
35+
return
36+
}
3437

3538
val bytes = blobModule!!.resolve(blobId, blob.getInt("offset"), blob.getInt("size"))
3639
if (bytes == null) {
@@ -197,12 +200,12 @@ class NativeFsModule(private val reactContext: ReactApplicationContext) {
197200
try {
198201
val bytes =
199202
fileBackend.read(ensureWhiteListedPath(filepath))
200-
val typeRef: TypeReference<MutableMap<String?, Any?>?> =
201-
object : TypeReference<MutableMap<String?, Any?>?>() {
203+
val typeRef: TypeReference<MutableMap<String, Any?>?> =
204+
object : TypeReference<MutableMap<String, Any?>?>() {
202205
}
203206
promise.resolve(
204207
Arguments.makeNativeMap(
205-
ObjectMapper().readValue<MutableMap<String?, Any?>?>(
208+
ObjectMapper().readValue<MutableMap<String, Any?>?>(
206209
bytes,
207210
typeRef
208211
)

0 commit comments

Comments
 (0)