Browse Source

WEIRD SHIT

pulltorefresh
Overtorment 6 years ago
parent
commit
28e9c88f5e
  1. 1
      android/app/src/main/java/com/bluewallet/MainApplication.java
  2. 2
      android/build.gradle
  3. 3
      android/gradle/wrapper/gradle-wrapper.properties
  4. 2
      android/settings.gradle
  5. 4
      package-lock.json
  6. 6
      screen/lnd/browser.js

1
android/app/src/main/java/com/bluewallet/MainApplication.java

@ -37,7 +37,6 @@ public class MainApplication extends Application implements ReactApplication {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new SvgPackage(),
new RNCameraPackage(),
new RNCWebViewPackage(),
new RNFSPackage() ,
new VectorIconsPackage(),

2
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

3
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

2
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'

4
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
}
}
},

6
screen/lnd/browser.js

@ -304,7 +304,8 @@ export default class Browser extends Component {
<WebView
ref={ref => (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');
}
}}

Loading…
Cancel
Save