Skip to content

Commit 7e1c46e

Browse files
committed
crashy android
1 parent 7cbe582 commit 7e1c46e

File tree

7 files changed

+11
-116
lines changed

7 files changed

+11
-116
lines changed

android/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="co.edgesecure.app">
3-
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
<uses-permission android:name="android.permission.INTERNET" />
54
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
65
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -35,7 +34,6 @@
3534
android:icon="@mipmap/ic_launcher"
3635
android:roundIcon="@mipmap/ic_launcher_round"
3736
android:allowBackup="false"
38-
android:extractNativeLibs="true"
3937
android:usesCleartextTraffic="true"
4038
android:theme="@style/Theme.App.Starting">
4139
<meta-data android:name="com.bugsnag.android.API_KEY"

android/app/src/main/java/co/edgesecure/app/MainActivity.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import com.facebook.react.ReactActivity
88
import com.facebook.react.ReactActivityDelegate
99
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
1010
import com.facebook.react.defaults.DefaultReactActivityDelegate
11-
import com.zoontek.rnbootsplash.RNBootSplash
1211
import expo.modules.ReactActivityDelegateWrapper
1312

1413
class MainActivity : ReactActivity() {
@@ -30,8 +29,6 @@ class MainActivity : ReactActivity() {
3029
)
3130

3231
override fun onCreate(savedInstanceState: Bundle?) {
33-
// Keep the splash screen around until we are ready to hide it:
34-
RNBootSplash.init(this)
3532

3633
// Do not pass the saved state, as required by react-native-screens:
3734
super.onCreate(null)

ios/Podfile.lock

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,25 +1479,6 @@ PODS:
14791479
- ZIPFoundation (= 0.9.11)
14801480
- rn-id-blurview (1.2.1):
14811481
- React
1482-
- RNBootSplash (4.7.4):
1483-
- glog
1484-
- hermes-engine
1485-
- RCT-Folly (= 2022.05.16.00)
1486-
- RCTRequired
1487-
- RCTTypeSafety
1488-
- React-Codegen
1489-
- React-Core
1490-
- React-debug
1491-
- React-Fabric
1492-
- React-graphics
1493-
- React-ImageManager
1494-
- React-NativeModulesApple
1495-
- React-RCTFabric
1496-
- React-rendererdebug
1497-
- React-utils
1498-
- ReactCommon/turbomodule/bridging
1499-
- ReactCommon/turbomodule/core
1500-
- Yoga
15011482
- RNCAsyncStorage (1.19.4):
15021483
- glog
15031484
- hermes-engine
@@ -2013,7 +1994,6 @@ DEPENDENCIES:
20131994
- ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
20141995
- ReactNativeFileAccess (from `../node_modules/react-native-file-access`)
20151996
- rn-id-blurview (from `../node_modules/rn-id-blurview`)
2016-
- RNBootSplash (from `../node_modules/react-native-bootsplash`)
20171997
- "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)"
20181998
- "RNCClipboard (from `../node_modules/@react-native-clipboard/clipboard`)"
20191999
- "RNCPicker (from `../node_modules/@react-native-picker/picker`)"
@@ -2260,8 +2240,6 @@ EXTERNAL SOURCES:
22602240
:path: "../node_modules/react-native-file-access"
22612241
rn-id-blurview:
22622242
:path: "../node_modules/rn-id-blurview"
2263-
RNBootSplash:
2264-
:path: "../node_modules/react-native-bootsplash"
22652243
RNCAsyncStorage:
22662244
:path: "../node_modules/@react-native-async-storage/async-storage"
22672245
RNCClipboard:
@@ -2427,7 +2405,6 @@ SPEC CHECKSUMS:
24272405
ReactCommon: 2aa35648354bd4c4665b9a5084a7d37097b89c10
24282406
ReactNativeFileAccess: 751f602d94efe9c1c52b5e3549964bfab938ed3f
24292407
rn-id-blurview: 42b72b8741b1624ef5052928ec7c04fcb345e198
2430-
RNBootSplash: ea97d26316507f564d8569597bcfd5a9da9f35ec
24312408
RNCAsyncStorage: 44435c63b1739bca14221ba90d422f33493e3d1f
24322409
RNCClipboard: 081418ae3b391b1012c3f41d045e5e39f1beed71
24332410
RNCPicker: 6d5d64e7b90c240c779ee0938ec433c11e2dd758

ios/edge/AppDelegate.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// Edge additions:
88
#import "ExpoModulesCore-Swift.h"
99
#import "Edge-Swift.h"
10-
#import "RNBootSplash.h"
10+
// #import "RNBootSplash.h"
1111
#import <Bugsnag/Bugsnag.h>
1212
#import <Firebase.h>
1313
#import <FirebaseMessaging.h>
@@ -95,7 +95,7 @@ - (UIView *)createRootViewWithBridge:(RCTBridge *)bridge
9595
moduleName:moduleName
9696
initProps:initProps];
9797

98-
[RNBootSplash initWithStoryboard:@"LaunchScreen" rootView:rootView];
98+
// [RNBootSplash initWithStoryboard:@"LaunchScreen" rootView:rootView];
9999

100100
return rootView;
101101
}

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
"react": "18.2.0",
120120
"react-native": "0.73.6",
121121
"react-native-airship": "^0.2.12",
122-
"react-native-bootsplash": "^4.7.4",
123122
"react-native-camera": "^1.13.1",
124123
"react-native-check-version": "^1.0.5",
125124
"react-native-confetti-cannon": "^1.5.2",

src/components/services/EdgeCoreManager.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import makeMoneroIo from 'edge-currency-monero/lib/react-native-io'
66
import { debugUri as exchangeDebugUri, pluginUri as exchangeUri } from 'edge-exchange-plugins'
77
import * as React from 'react'
88
import { Alert } from 'react-native'
9-
import RNBootSplash from 'react-native-bootsplash'
9+
// import RNBootSplash from 'react-native-bootsplash'
1010
import { getBrand, getDeviceId } from 'react-native-device-info'
1111

1212
import { ENV } from '../../env'
@@ -17,7 +17,7 @@ import { allPlugins } from '../../util/corePlugins'
1717
import { fakeUser } from '../../util/fake-user'
1818
import { isMaestro } from '../../util/maestro'
1919
import { LoadingSplashScreen } from '../progress-indicators/LoadingSplashScreen'
20-
import { showError } from './AirshipInstance'
20+
// import { showError } from './AirshipInstance'
2121
import { Providers } from './Providers'
2222

2323
const LOGIN_TEST_SERVER = 'https://login-tester.edge.app/api'
@@ -88,9 +88,9 @@ export function EdgeCoreManager(props: Props) {
8888

8989
function hideSplash() {
9090
if (!splashHidden.current) {
91-
setTimeout(() => {
92-
RNBootSplash.hide({ fade: true }).catch(err => showError(err))
93-
}, 200)
91+
// setTimeout(() => {
92+
// RNBootSplash.hide({ fade: true }).catch(err => showError(err))
93+
// }, 200)
9494
splashHidden.current = true
9595
}
9696
}

yarn.lock

Lines changed: 2 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -8942,11 +8942,6 @@ detect-libc@^1.0.3:
89428942
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
89438943
integrity sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==
89448944

8945-
detect-libc@^2.0.0, detect-libc@^2.0.1:
8946-
version "2.0.1"
8947-
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.0.1.tgz#e1897aa88fa6ad197862937fbc0441ef352ee0cd"
8948-
integrity sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==
8949-
89508945
detect-newline@^3.0.0:
89518946
version "3.1.0"
89528947
resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
@@ -11022,15 +11017,6 @@ fs-extra@^10.1.0:
1102211017
jsonfile "^6.0.1"
1102311018
universalify "^2.0.0"
1102411019

11025-
fs-extra@^11.1.1:
11026-
version "11.1.1"
11027-
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d"
11028-
integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==
11029-
dependencies:
11030-
graceful-fs "^4.2.0"
11031-
jsonfile "^6.0.1"
11032-
universalify "^2.0.0"
11033-
1103411020
fs-extra@^4.0.2:
1103511021
version "4.0.3"
1103611022
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
@@ -14617,13 +14603,6 @@ node-abi@^2.21.0:
1461714603
dependencies:
1461814604
semver "^5.4.1"
1461914605

14620-
node-abi@^3.3.0:
14621-
version "3.45.0"
14622-
resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.45.0.tgz#f568f163a3bfca5aacfce1fbeee1fa2cc98441f5"
14623-
integrity sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==
14624-
dependencies:
14625-
semver "^7.3.5"
14626-
1462714606
node-abort-controller@^3.1.1:
1462814607
version "3.1.1"
1462914608
resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
@@ -14649,11 +14628,6 @@ node-addon-api@^5.0.0:
1464914628
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
1465014629
integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==
1465114630

14652-
node-addon-api@^6.1.0:
14653-
version "6.1.0"
14654-
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-6.1.0.tgz#ac8470034e58e67d0c6f1204a18ae6995d9c0d76"
14655-
integrity sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==
14656-
1465714631
node-addon-api@^7.0.0:
1465814632
version "7.1.0"
1465914633
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-7.1.0.tgz#71f609369379c08e251c558527a107107b5e0fdb"
@@ -15612,24 +15586,6 @@ prebuild-install@^6.0.0:
1561215586
tar-fs "^2.0.0"
1561315587
tunnel-agent "^0.6.0"
1561415588

15615-
prebuild-install@^7.1.1:
15616-
version "7.1.1"
15617-
resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-7.1.1.tgz#de97d5b34a70a0c81334fd24641f2a1702352e45"
15618-
integrity sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==
15619-
dependencies:
15620-
detect-libc "^2.0.0"
15621-
expand-template "^2.0.3"
15622-
github-from-package "0.0.0"
15623-
minimist "^1.2.3"
15624-
mkdirp-classic "^0.5.3"
15625-
napi-build-utils "^1.0.1"
15626-
node-abi "^3.3.0"
15627-
pump "^3.0.0"
15628-
rc "^1.2.7"
15629-
simple-get "^4.0.0"
15630-
tar-fs "^2.0.0"
15631-
tunnel-agent "^0.6.0"
15632-
1563315589
prelude-ls@^1.2.1:
1563415590
version "1.2.1"
1563515591
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -16068,15 +16024,6 @@ react-native-airship@^0.2.12, react-native-airship@^0.2.9:
1606816024
dependencies:
1606916025
yavent "^0.1.1"
1607016026

16071-
react-native-bootsplash@^4.7.4:
16072-
version "4.7.4"
16073-
resolved "https://registry.yarnpkg.com/react-native-bootsplash/-/react-native-bootsplash-4.7.4.tgz#5ff2b53751dcb2a380915ef6b853f3352b978a9f"
16074-
integrity sha512-t1g2KM+sNYj/6pjBz5b6tBzCjRWhfAUD2hhVCcrv9bDVdyM+C0QvASOt8W50VpiN+KW/zzf7HO24+fCx0G5qtA==
16075-
dependencies:
16076-
fs-extra "^11.1.1"
16077-
picocolors "^1.0.0"
16078-
sharp "^0.32.1"
16079-
1608016027
react-native-camera@^1.13.1:
1608116028
version "1.13.1"
1608216029
resolved "https://registry.yarnpkg.com/react-native-camera/-/react-native-camera-1.13.1.tgz#19277ccae0a49dbf1b96049da5b95c847ea7aff2"
@@ -17224,7 +17171,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.3.0, semver@^6.3.1:
1722417171
resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
1722517172
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
1722617173

17227-
semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
17174+
semver@^7.3.2, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
1722817175
version "7.6.0"
1722917176
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
1723017177
integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
@@ -17372,20 +17319,6 @@ shallow-clone@^3.0.0:
1737217319
dependencies:
1737317320
kind-of "^6.0.2"
1737417321

17375-
sharp@^0.32.1:
17376-
version "0.32.1"
17377-
resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.32.1.tgz#41aa0d0b2048b2e0ee453d9fcb14ec1f408390fe"
17378-
integrity sha512-kQTFtj7ldpUqSe8kDxoGLZc1rnMFU0AO2pqbX6pLy3b7Oj8ivJIdoKNwxHVQG2HN6XpHPJqCSM2nsma2gOXvOg==
17379-
dependencies:
17380-
color "^4.2.3"
17381-
detect-libc "^2.0.1"
17382-
node-addon-api "^6.1.0"
17383-
prebuild-install "^7.1.1"
17384-
semver "^7.5.0"
17385-
simple-get "^4.0.1"
17386-
tar-fs "^2.1.1"
17387-
tunnel-agent "^0.6.0"
17388-
1738917322
shebang-command@^1.2.0:
1739017323
version "1.2.0"
1739117324
resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -17465,15 +17398,6 @@ simple-get@^3.0.3:
1746517398
once "^1.3.1"
1746617399
simple-concat "^1.0.0"
1746717400

17468-
simple-get@^4.0.0, simple-get@^4.0.1:
17469-
version "4.0.1"
17470-
resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.1.tgz#4a39db549287c979d352112fa03fd99fd6bc3543"
17471-
integrity sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==
17472-
dependencies:
17473-
decompress-response "^6.0.0"
17474-
once "^1.3.1"
17475-
simple-concat "^1.0.0"
17476-
1747717401
simple-plist@^1.1.0:
1747817402
version "1.3.1"
1747917403
resolved "https://registry.yarnpkg.com/simple-plist/-/simple-plist-1.3.1.tgz#16e1d8f62c6c9b691b8383127663d834112fb017"
@@ -18238,7 +18162,7 @@ tapable@^2.1.1, tapable@^2.2.0:
1823818162
resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
1823918163
integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
1824018164

18241-
tar-fs@^2.0.0, tar-fs@^2.1.1:
18165+
tar-fs@^2.0.0:
1824218166
version "2.1.1"
1824318167
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
1824418168
integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==

0 commit comments

Comments
 (0)