From 64a9847b21823d4552170c202f500b3aa7f3e38a Mon Sep 17 00:00:00 2001 From: Roman Volosovskyi Date: Fri, 18 Nov 2016 16:49:51 +0200 Subject: [PATCH] fix #452 --- android/app/BUCK | 4 ++-- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 2 +- .../{com/statusim => im/status/ethereum}/MainActivity.java | 2 +- .../statusim => im/status/ethereum}/MainApplication.java | 4 ++-- .../java/{com/statusim => im/status/ethereum}/RootUtil.java | 2 +- ios/StatusIm.xcodeproj/project.pbxproj | 4 ++-- modules/react-native-status/android/build.gradle | 2 +- .../android/src/main/AndroidManifest.xml | 2 +- .../status/ethereum}/module/ConnectorHandler.java | 2 +- .../status/ethereum}/module/ServiceConnector.java | 2 +- .../status/ethereum}/module/StatusConnector.java | 2 +- .../status/ethereum}/module/StatusMessages.java | 2 +- .../status/ethereum}/module/StatusModule.java | 2 +- .../status/ethereum}/module/StatusPackage.java | 6 +++--- .../status/ethereum}/module/StatusService.java | 2 +- modules/react-native-status/ios/RCTStatus/pom.xml | 2 +- test/clj/status_im/appium.clj | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) rename android/app/src/main/java/{com/statusim => im/status/ethereum}/MainActivity.java (99%) rename android/app/src/main/java/{com/statusim => im/status/ethereum}/MainApplication.java (96%) rename android/app/src/main/java/{com/statusim => im/status/ethereum}/RootUtil.java (97%) rename modules/react-native-status/android/src/main/java/{com/statusim => im/status/ethereum}/module/ConnectorHandler.java (83%) rename modules/react-native-status/android/src/main/java/{com/statusim => im/status/ethereum}/module/ServiceConnector.java (99%) rename modules/react-native-status/android/src/main/java/{com/statusim => im/status/ethereum}/module/StatusConnector.java (99%) rename modules/react-native-status/android/src/main/java/{com/statusim => im/status/ethereum}/module/StatusMessages.java (96%) rename modules/react-native-status/android/src/main/java/{com/statusim => im/status/ethereum}/module/StatusModule.java (99%) rename modules/react-native-status/android/src/main/java/{com/statusim => im/status/ethereum}/module/StatusPackage.java (92%) rename modules/react-native-status/android/src/main/java/{com/statusim => im/status/ethereum}/module/StatusService.java (99%) diff --git a/android/app/BUCK b/android/app/BUCK index 8e2329a84c..7e80564a8b 100644 --- a/android/app/BUCK +++ b/android/app/BUCK @@ -46,13 +46,13 @@ android_library( android_build_config( name = 'build_config', - package = 'com.statusim', + package = 'im.status.ethereum', ) android_resource( name = 'res', res = 'src/main/res', - package = 'com.statusim', + package = 'im.status.ethereum', ) android_binary( diff --git a/android/app/build.gradle b/android/app/build.gradle index ba0a7e2e97..1e31a7daa9 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -84,7 +84,7 @@ android { buildToolsVersion "23.0.1" defaultConfig { - applicationId "com.statusim" + applicationId "im.status.ethereum" minSdkVersion 18 targetSdkVersion 22 versionCode 1 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 99ed60c770..187790fd58 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="im.status.ethereum"> diff --git a/android/app/src/main/java/com/statusim/MainActivity.java b/android/app/src/main/java/im/status/ethereum/MainActivity.java similarity index 99% rename from android/app/src/main/java/com/statusim/MainActivity.java rename to android/app/src/main/java/im/status/ethereum/MainActivity.java index 104f9ea552..95f124e981 100644 --- a/android/app/src/main/java/com/statusim/MainActivity.java +++ b/android/app/src/main/java/im/status/ethereum/MainActivity.java @@ -1,4 +1,4 @@ -package com.statusim; +package im.status.ethereum; import android.app.AlertDialog; import android.content.DialogInterface; diff --git a/android/app/src/main/java/com/statusim/MainApplication.java b/android/app/src/main/java/im/status/ethereum/MainApplication.java similarity index 96% rename from android/app/src/main/java/com/statusim/MainApplication.java rename to android/app/src/main/java/im/status/ethereum/MainApplication.java index dd8a307511..570e57b09f 100644 --- a/android/app/src/main/java/com/statusim/MainApplication.java +++ b/android/app/src/main/java/im/status/ethereum/MainApplication.java @@ -1,4 +1,4 @@ -package com.statusim; +package im.status.ethereum; import android.app.Application; @@ -9,7 +9,7 @@ import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; -import com.statusim.module.StatusPackage; +import im.status.ethereum.module.StatusPackage; import io.realm.react.RealmReactPackage; import com.oblador.vectoricons.VectorIconsPackage; import com.rt2zz.reactnativecontacts.ReactNativeContacts; diff --git a/android/app/src/main/java/com/statusim/RootUtil.java b/android/app/src/main/java/im/status/ethereum/RootUtil.java similarity index 97% rename from android/app/src/main/java/com/statusim/RootUtil.java rename to android/app/src/main/java/im/status/ethereum/RootUtil.java index 664e9805a6..5c74f566df 100644 --- a/android/app/src/main/java/com/statusim/RootUtil.java +++ b/android/app/src/main/java/im/status/ethereum/RootUtil.java @@ -1,4 +1,4 @@ -package com.statusim; +package im.status.ethereum; import java.io.File; import java.io.BufferedReader; diff --git a/ios/StatusIm.xcodeproj/project.pbxproj b/ios/StatusIm.xcodeproj/project.pbxproj index 00242aef5e..0f15d1d622 100644 --- a/ios/StatusIm.xcodeproj/project.pbxproj +++ b/ios/StatusIm.xcodeproj/project.pbxproj @@ -1657,7 +1657,7 @@ "-lc++", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.statusim; + PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum; PRODUCT_NAME = StatusIm; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; }; @@ -1709,7 +1709,7 @@ "-lc++", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.statusim; + PRODUCT_BUNDLE_IDENTIFIER = im.status.ethereum; PRODUCT_NAME = StatusIm; VALID_ARCHS = "arm64 armv7 armv7s x86_64"; }; diff --git a/modules/react-native-status/android/build.gradle b/modules/react-native-status/android/build.gradle index 7cbdccfdb2..6f20f5c8da 100644 --- a/modules/react-native-status/android/build.gradle +++ b/modules/react-native-status/android/build.gradle @@ -14,5 +14,5 @@ android { dependencies { compile 'com.facebook.react:react-native:+' - compile(group: 'status-im', name: 'status-go', version: 'tx-discard', ext: 'aar') + compile(group: 'status-im', name: 'status-go', version: 'tx-multi-actions', ext: 'aar') } diff --git a/modules/react-native-status/android/src/main/AndroidManifest.xml b/modules/react-native-status/android/src/main/AndroidManifest.xml index 2b6aeb87f8..46151203f0 100644 --- a/modules/react-native-status/android/src/main/AndroidManifest.xml +++ b/modules/react-native-status/android/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/modules/react-native-status/android/src/main/java/com/statusim/module/ConnectorHandler.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/ConnectorHandler.java similarity index 83% rename from modules/react-native-status/android/src/main/java/com/statusim/module/ConnectorHandler.java rename to modules/react-native-status/android/src/main/java/im/status/ethereum/module/ConnectorHandler.java index 5259e17ce3..3dbba9b662 100644 --- a/modules/react-native-status/android/src/main/java/com/statusim/module/ConnectorHandler.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/ConnectorHandler.java @@ -1,4 +1,4 @@ -package com.statusim.module; +package im.status.ethereum.module; import android.os.Message; diff --git a/modules/react-native-status/android/src/main/java/com/statusim/module/ServiceConnector.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/ServiceConnector.java similarity index 99% rename from modules/react-native-status/android/src/main/java/com/statusim/module/ServiceConnector.java rename to modules/react-native-status/android/src/main/java/im/status/ethereum/module/ServiceConnector.java index 78b225d109..860a216d98 100644 --- a/modules/react-native-status/android/src/main/java/com/statusim/module/ServiceConnector.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/ServiceConnector.java @@ -1,4 +1,4 @@ -package com.statusim.module; +package im.status.ethereum.module; import android.content.ComponentName; diff --git a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusConnector.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusConnector.java similarity index 99% rename from modules/react-native-status/android/src/main/java/com/statusim/module/StatusConnector.java rename to modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusConnector.java index 14d821c3fb..e09835a481 100644 --- a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusConnector.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusConnector.java @@ -1,4 +1,4 @@ -package com.statusim.module; +package im.status.ethereum.module; import android.content.Context; diff --git a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusMessages.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusMessages.java similarity index 96% rename from modules/react-native-status/android/src/main/java/com/statusim/module/StatusMessages.java rename to modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusMessages.java index 36ec5473a7..5e2da70828 100644 --- a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusMessages.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusMessages.java @@ -1,4 +1,4 @@ -package com.statusim.module; +package im.status.ethereum.module; public class StatusMessages { diff --git a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusModule.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java similarity index 99% rename from modules/react-native-status/android/src/main/java/com/statusim/module/StatusModule.java rename to modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java index d761d0da62..5b8d2836fd 100644 --- a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusModule.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusModule.java @@ -1,4 +1,4 @@ -package com.statusim.module; +package im.status.ethereum.module; import android.app.Activity; import android.view.WindowManager; diff --git a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusPackage.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java similarity index 92% rename from modules/react-native-status/android/src/main/java/com/statusim/module/StatusPackage.java rename to modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java index e88214b14a..1606184d5c 100644 --- a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusPackage.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusPackage.java @@ -1,11 +1,11 @@ -package com.statusim.module; +package im.status.ethereum.module; import com.facebook.react.ReactPackage; import com.facebook.react.bridge.JavaScriptModule; import com.facebook.react.bridge.NativeModule; import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.uimanager.ViewManager; -import com.statusim.module.StatusService; +import im.status.ethereum.module.StatusService; import java.util.ArrayList; import java.util.Collections; @@ -32,4 +32,4 @@ public class StatusPackage implements ReactPackage { public List createViewManagers(ReactApplicationContext reactContext) { return Collections.emptyList(); } -} \ No newline at end of file +} diff --git a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusService.java b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java similarity index 99% rename from modules/react-native-status/android/src/main/java/com/statusim/module/StatusService.java rename to modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java index 114db76ef5..ef0d5b47c7 100644 --- a/modules/react-native-status/android/src/main/java/com/statusim/module/StatusService.java +++ b/modules/react-native-status/android/src/main/java/im/status/ethereum/module/StatusService.java @@ -1,4 +1,4 @@ -package com.statusim.module; +package im.status.ethereum.module; import android.app.Service; import android.content.Intent; diff --git a/modules/react-native-status/ios/RCTStatus/pom.xml b/modules/react-native-status/ios/RCTStatus/pom.xml index c622c9f65d..5857cba06b 100644 --- a/modules/react-native-status/ios/RCTStatus/pom.xml +++ b/modules/react-native-status/ios/RCTStatus/pom.xml @@ -25,7 +25,7 @@ status-im status-go-ios-simulator - tx-discard + tx-multi-actions zip true ./ diff --git a/test/clj/status_im/appium.clj b/test/clj/status_im/appium.clj index 40170acc9a..bf769a192a 100644 --- a/test/clj/status_im/appium.clj +++ b/test/clj/status_im/appium.clj @@ -16,7 +16,7 @@ (.setCapability "deviceName" "device") (.setCapability "platformVersion" "6.0.0") (.setCapability "app" (.getAbsolutePath app)) - (.setCapability "appPackage" "com.statusim") + (.setCapability "appPackage" "im.status.ethereum") (.setCapability "appActivity" ".MainActivity")) driver (AndroidDriver. (URL. "http://127.0.0.1:4723/wd/hub") capabilities)] (-> driver