Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Get rid of StatusService. #7334

Merged
merged 1 commit into from
Jan 29, 2019
Merged

Get rid of StatusService. #7334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@
<data android:scheme="status-im" />
</intent-filter>
</activity>
<service
android:name=".module.StatusService"
android:enabled="true"
android:exported="true"/>
<activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
<service android:name="io.invertase.firebase.messaging.RNFirebaseMessagingService">
<intent-filter>
Expand Down
57 changes: 24 additions & 33 deletions android/app/src/main/java/im/status/ethereum/MainApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,36 +1,39 @@
package im.status.ethereum;

import android.support.multidex.MultiDexApplication;

import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
import org.devio.rn.splashscreen.SplashScreenReactPackage;
import com.facebook.react.ReactApplication;
import io.invertase.firebase.RNFirebasePackage;
import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
import com.ocetnik.timer.BackgroundTimerPackage;
import com.horcrux.svg.SvgPackage;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
import com.facebook.react.ReactNativeHost;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;
import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;
import com.AlexanderZaytsev.RNI18n.RNI18nPackage;
import org.reactnative.camera.RNCameraPackage;
import com.horcrux.svg.SvgPackage;
import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
import com.oblador.keychain.KeychainPackage;
import com.ocetnik.timer.BackgroundTimerPackage;
import com.reactnative.ivpusic.imagepicker.PickerPackage;
import com.rnfs.RNFSPackage;
import fr.bamlab.rnimageresizer.ImageResizerPackage;
import im.status.ethereum.module.StatusPackage;
import im.status.ethereum.keycard.RNStatusKeycardPackage;
import io.realm.react.RealmReactPackage;
import me.alwx.HttpServer.HttpServerReactPackage;
import com.oblador.keychain.KeychainPackage;

import java.util.ArrayList;
import net.rhogan.rnsecurerandom.RNSecureRandomPackage;

import org.devio.rn.splashscreen.SplashScreenReactPackage;
import org.reactnative.camera.RNCameraPackage;

import java.util.Arrays;
import java.util.List;

import fr.bamlab.rnimageresizer.ImageResizerPackage;
import im.status.ethereum.function.Function;
import im.status.ethereum.keycard.RNStatusKeycardPackage;
import im.status.ethereum.module.StatusPackage;
import io.invertase.firebase.RNFirebasePackage;
import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
import io.realm.react.RealmReactPackage;
import me.alwx.HttpServer.HttpServerReactPackage;

public class MainApplication extends MultiDexApplication implements ReactApplication {

Expand All @@ -42,19 +45,9 @@ public boolean getUseDeveloperSupport() {

@Override
protected List<ReactPackage> getPackages() {
boolean devCluster = false;
if (BuildConfig.ETHEREUM_DEV_CLUSTER == "1") {
devCluster = true;
}

boolean webViewDebugEnabled = false;
if (BuildConfig.DEBUG_WEBVIEW == "1") {
webViewDebugEnabled = true;
}

StatusPackage statusPackage = new StatusPackage(BuildConfig.DEBUG, devCluster, RootUtil.isDeviceRooted());
StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());
Function<String, String> callRPC = statusPackage.getCallRPC();
List<ReactPackage> packages = new ArrayList<ReactPackage>(Arrays.asList(
return Arrays.asList(
new MainReactPackage(),
new RNFirebasePackage(),
new RNFirebaseMessagingPackage(),
Expand All @@ -73,11 +66,9 @@ protected List<ReactPackage> getPackages() {
new ReactNativeDialogsPackage(),
new ImageResizerPackage(),
new PickerPackage(),
new WebViewBridgePackage(webViewDebugEnabled, callRPC),
new WebViewBridgePackage(BuildConfig.DEBUG_WEBVIEW == "1", callRPC),
new ReactNativeConfigPackage(),
new KeychainPackage()));

return packages;
new KeychainPackage());
}

@Override
Expand Down
8 changes: 4 additions & 4 deletions modules/react-native-status/android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ def getStatusGoVersion = { ->
}

android {
compileSdkVersion 26
compileSdkVersion 28

defaultConfig {
minSdkVersion 18
targetSdkVersion 23
minSdkVersion 23
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this mean that the lowest Android version we support is 6.0?

Copy link
Contributor Author

@mandrigin mandrigin Jan 24, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The app itself already requires minSdkVersion 23, so to make react-native-status do that, it's no problem.

targetSdkVersion 28
versionCode 1
versionName "1.0"
}
}

dependencies {
implementation 'com.facebook.react:react-native:+'
implementation 'com.facebook.react:react-native:+' // from node_modules
compile 'com.github.status-im:function:0.0.1'

// WARNING: If you change this, make sure the GitHub release of the .aar exists.
Expand Down
10 changes: 0 additions & 10 deletions ...react-native-status/android/src/main/java/im/status/ethereum/module/ConnectorHandler.java
View file
Open in desktop

This file was deleted.

153 changes: 0 additions & 153 deletions ...react-native-status/android/src/main/java/im/status/ethereum/module/ServiceConnector.java
View file
Open in desktop

This file was deleted.

Loading