From 28e9c88f5e342afcfb33e17f8df8e0d17eb5ce97 Mon Sep 17 00:00:00 2001 From: Overtorment Date: Sat, 19 Jan 2019 03:53:31 +0000 Subject: [PATCH] WEIRD SHIT --- .../app/src/main/java/com/bluewallet/MainApplication.java | 1 - android/build.gradle | 2 +- android/gradle/wrapper/gradle-wrapper.properties | 3 ++- android/settings.gradle | 2 -- package-lock.json | 4 +++- screen/lnd/browser.js | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/android/app/src/main/java/com/bluewallet/MainApplication.java b/android/app/src/main/java/com/bluewallet/MainApplication.java index e3a532221..ea99d14ae 100644 --- a/android/app/src/main/java/com/bluewallet/MainApplication.java +++ b/android/app/src/main/java/com/bluewallet/MainApplication.java @@ -37,7 +37,6 @@ public class MainApplication extends Application implements ReactApplication { return Arrays.asList( new MainReactPackage(), new SvgPackage(), - new RNCameraPackage(), new RNCWebViewPackage(), new RNFSPackage() , new VectorIconsPackage(), diff --git a/android/build.gradle b/android/build.gradle index 9c54cfcd0..6d9af53a9 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -13,7 +13,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.4' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index b6517bb1d..e4a6127b9 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Sat Jan 19 02:29:20 GMT 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index b22f77f4f..18b8a41a3 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,8 +1,6 @@ rootProject.name = 'BlueWallet' include ':react-native-svg' project(':react-native-svg').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-svg/android') -include ':react-native-camera' -project(':react-native-camera').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-camera/android') include ':react-native-webview' project(':react-native-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview/android') include ':react-native-fs' diff --git a/package-lock.json b/package-lock.json index f14c13bdd..0e5961532 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7502,6 +7502,7 @@ "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7510,7 +7511,8 @@ "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" + "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "optional": true } } }, diff --git a/screen/lnd/browser.js b/screen/lnd/browser.js index 96e5cab7d..33a5f2b85 100644 --- a/screen/lnd/browser.js +++ b/screen/lnd/browser.js @@ -304,7 +304,8 @@ export default class Browser extends Component { (this.webview = ref)} source={{ uri: this.state.url }} - mixedContentMode={'compatibility'} + originWhitelist={['*']} + injectedJavaScript={injectedParadise} onMessage={e => { // this is a handler which receives messages sent from within the browser console.log('---- message from the bus:', e.nativeEvent.data); @@ -385,12 +386,11 @@ export default class Browser extends Component { console.log('load end'); this.setState({ url: e.nativeEvent.url, pageIsLoading: false }); }} - injectJavaScript={injectedParadise} onLoadProgress={e => { console.log('progress:', e.nativeEvent.progress); if (!alreadyInjected && e.nativeEvent.progress > 0.5) { // this.webview.injectJavaScript(injectedParadise); - alreadyInjected = true; + // alreadyInjected = true; console.log('injected'); } }}