Просмотр исходного кода

v.1.3.3
- Push notifications privacy issue - https://github.com/unaio/una/issues/2503
- Packages update

Alex Trofimov 6 лет назад
Родитель
Сommit
3395cbabe0
6 измененных файлов с 730 добавлено и 128 удалено
  1. 5 3
      App.js
  2. 2 2
      android/app/build.gradle
  3. 8 8
      ios/Podfile.lock
  4. 4 4
      ios/una.xcodeproj/project.pbxproj
  5. 704 104
      package-lock.json
  6. 7 7
      package.json

+ 5 - 3
App.js

@@ -304,9 +304,11 @@ export default class App extends Component<Props> {
             });
         }
         
-        if ('undefined' !== typeof(oMsgData['push_tags'])) {
-            if ('undefined' !== typeof(oMsgData['push_tags']['email'])) {
-                OneSignal.setEmail(oMsgData['push_tags']['email'], oMsgData['push_tags']['email_hash']);
+        if ('undefined' !== typeof(oMsgData['push_tags']) && oMsgData['push_tags'] !== false) {
+            if ('undefined' !== typeof(oMsgData['push_tags']['email']) && oMsgData['push_tags']['email'].length) {
+                OneSignal.setEmail(oMsgData['push_tags']['email'], oMsgData['push_tags']['email_hash'], (sError) => {
+                    console.warn("OneSignal set email error:" + sError);
+                });
                 delete oMsgData['push_tags']['email'];
                 delete oMsgData['push_tags']['email_hash'];
             }

+ 2 - 2
android/app/build.gradle

@@ -131,8 +131,8 @@ android {
         applicationId "com.una.android"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1320
-        versionName "1.3.2"
+        versionCode 1330
+        versionName "1.3.3"
     }
     signingConfigs {
         release {

+ 8 - 8
ios/Podfile.lock

@@ -19,7 +19,7 @@ PODS:
     - DoubleConversion
     - glog
   - glog (0.3.5)
-  - OneSignal (2.11.2)
+  - OneSignal (2.12.3)
   - RCTRequired (0.61.2)
   - RCTTypeSafety (0.61.2):
     - FBLazyVector (= 0.61.2)
@@ -183,12 +183,12 @@ PODS:
     - React-cxxreact (= 0.61.2)
     - React-jsi (= 0.61.2)
   - React-jsinspector (0.61.2)
-  - react-native-onesignal (3.4.2):
-    - OneSignal (= 2.11.2)
+  - react-native-onesignal (3.6.1):
+    - OneSignal (= 2.12.3)
     - React (< 1.0.0, >= 0.13.0)
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webview (7.4.1):
+  - react-native-webview (7.6.0):
     - React
   - React-RCTActionSheet (0.61.2):
     - React-Core/RCTActionSheetHeaders (= 0.61.2)
@@ -330,7 +330,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: 5a764c60abdc3336a213e5310c40b74741f32839
   Folly: 30e7936e1c45c08d884aa59369ed951a8e68cf51
   glog: 1f3da668190260b06b429bb211bfbee5cd790c28
-  OneSignal: 4e3e68bb6c29975286a2fa910cb49132bc6e20bb
+  OneSignal: 30b6e03a1f14169c4313e301a7b7bdf467b5a575
   RCTRequired: c639d59ed389cfb1f1203f65c2ea946d8ec586e2
   RCTTypeSafety: dc23fb655d6c77667c78e327bf661bc11e3b8aec
   React: 7e586e5d7bec12b91c1a096826b0fc9ab1da7865
@@ -340,9 +340,9 @@ SPEC CHECKSUMS:
   React-jsi: 32285a21b1b24c36060493ed3057a34677d58d09
   React-jsiexecutor: 8909917ff7d8f21a57e443a866fd8d4560e50c65
   React-jsinspector: 111d7d342b07a904c400592e02a2b958f1098b60
-  react-native-onesignal: ede2c185dd3c4c04bdab98f10c92dfe6f9d61c5d
+  react-native-onesignal: d029b061807f5d14eaf765293099987f942d19f8
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webview: 4dbc1d2a4a6b9c5e9e723c62651917aa2b5e579e
+  react-native-webview: 711cef318a554093b09a5b871894011435d87a8d
   React-RCTActionSheet: 89b037c0fb7d2671607cb645760164e7e0c013f6
   React-RCTAnimation: e3cefa93c38c004c318f7ec04b883eb14b8b8235
   React-RCTBlob: d26ac0e313fbf14e7203473fd593ccaaeee8329e
@@ -357,4 +357,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 136ef0f3aacb37bea3c24628c44db68758229741
 
-COCOAPODS: 1.8.1
+COCOAPODS: 1.8.4

+ 4 - 4
ios/una.xcodeproj/project.pbxproj

@@ -717,12 +717,12 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = una/una.entitlements;
-				CURRENT_PROJECT_VERSION = 1322;
+				CURRENT_PROJECT_VERSION = 1332;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 235MTP3MJ2;
 				INFOPLIST_FILE = una/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -742,11 +742,11 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "";
 				CODE_SIGN_ENTITLEMENTS = una/una.entitlements;
-				CURRENT_PROJECT_VERSION = 1322;
+				CURRENT_PROJECT_VERSION = 1332;
 				DEVELOPMENT_TEAM = 235MTP3MJ2;
 				INFOPLIST_FILE = una/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.3.2;
+				MARKETING_VERSION = 1.3.3;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

Разница между файлами не показана из-за своего большого размера
+ 704 - 104
package-lock.json


+ 7 - 7
package.json

@@ -1,6 +1,6 @@
 {
   "name": "UNA",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
@@ -14,19 +14,19 @@
     "native-base": "^2.13.8",
     "react": "16.9.0",
     "react-native": "0.61.2",
-    "react-native-onesignal": "^3.4.2",
+    "react-native-onesignal": "^3.6.1",
     "react-native-splash-screen": "^3.2.0",
-    "react-native-webview": "^7.4.1"
+    "react-native-webview": "^7.6.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.6.2",
-    "@babel/runtime": "^7.6.2",
+    "@babel/core": "^7.7.7",
+    "@babel/runtime": "^7.7.7",
     "@bam.tech/react-native-make": "^1.0.3",
     "@react-native-community/eslint-config": "^0.0.5",
     "babel-jest": "^24.9.0",
-    "eslint": "^6.5.1",
+    "eslint": "^6.8.0",
     "jest": "^24.9.0",
-    "metro-react-native-babel-preset": "^0.56.0",
+    "metro-react-native-babel-preset": "^0.56.3",
     "react-test-renderer": "16.9.0"
   },
   "jest": {

Некоторые файлы не были показаны из-за большого количества измененных файлов