Unverified Commit 15de0fff authored by YJ's avatar YJ Committed by GitHub
Browse files

Merge pull request #246 from paritytech/yj-bump-reactnative

Bump React Native to 0.60.3 & bump react-navigation, keyboard, camera, native components.
parents eb55ff68 df80d466
Pipeline #43531 failed with stage
in 19 seconds
......@@ -49,7 +49,7 @@ public class EthkeyBridge extends ReactContextBaseJavaModule {
try {
promise.resolve(ethkeyBrainwalletBIP39Address(seed));
} catch (Exception e) {
promise.reject("invalid phrase", null, null);
promise.reject("invalid phrase", "invalid phrase");
}
}
......@@ -63,7 +63,7 @@ public class EthkeyBridge extends ReactContextBaseJavaModule {
try {
promise.resolve(ethkeyRlpItem(rlp, position));
} catch (Exception e) {
promise.reject("invalid rlp", null, null);
promise.reject("invalid rlp", "invalid rlp");
}
}
......@@ -98,7 +98,7 @@ public class EthkeyBridge extends ReactContextBaseJavaModule {
try {
promise.resolve(ethkeyDecryptData(data, password));
} catch (Exception e) {
promise.reject("invalid password", null, null);
promise.reject("invalid password", "invalid password");
}
}
......@@ -107,7 +107,7 @@ public class EthkeyBridge extends ReactContextBaseJavaModule {
try {
promise.resolve(ethkeyQrCode(data));
} catch (Exception e) {
promise.reject("failed to create QR code", null, null);
promise.reject("failed to create QR code", "failed to create QR code");
}
}
......
package io.parity.signer;
import com.facebook.react.ReactActivity;
import com.facebook.react.ReactActivityDelegate;
import com.facebook.react.ReactRootView;
import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
import android.os.Bundle;
import android.view.WindowManager;
......@@ -21,4 +25,15 @@ public class MainActivity extends ReactActivity {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
WindowManager.LayoutParams.FLAG_SECURE);
}
@Override
protected ReactActivityDelegate createReactActivityDelegate() {
return new ReactActivityDelegate(this, getMainComponentName()) {
@Override
protected ReactRootView createRootView() {
return new RNGestureHandlerEnabledRootView(MainActivity.this);
}
};
}
}
......@@ -3,14 +3,16 @@ package io.parity.signer;
import android.app.Application;
import com.facebook.react.ReactApplication;
import com.oblador.vectoricons.VectorIconsPackage;
import com.reactlibrary.RNSecureStoragePackage;
import com.reactnativecommunity.netinfo.NetInfoPackage;
import org.reactnative.camera.RNCameraPackage;
import com.reactlibrary.RNSecureStoragePackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;
import com.swmansion.gesturehandler.react.RNGestureHandlerPackage;
import java.util.Arrays;
import java.util.List;
......@@ -26,10 +28,11 @@ public class MainApplication extends Application implements ReactApplication {
protected List<ReactPackage> getPackages() {
return Arrays.<ReactPackage>asList(
new MainReactPackage(),
new VectorIconsPackage(),
new RNSecureStoragePackage(),
new NetInfoPackage(),
new RNCameraPackage(),
new EthkeyBridgePackage()
new RNSecureStoragePackage(),
new EthkeyBridgePackage(),
new RNGestureHandlerPackage()
);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment