Merge branch 'dev' of https://github.com/MohGovIL/hamagen-react-native

MohGovIL · Aug 27, 2020 · ec58c77 · ec58c77
2 parents 4c13112 + f79acf0
commit ec58c77
Show file tree

Hide file tree

Showing 62 changed files with 883 additions and 16,451 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -137,8 +137,8 @@ android {
         applicationId "com.hamagen"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 96
-        versionName '2.2.6'
+        versionCode 104
+        versionName '2.2.14'
     }
 
     dexOptions {

diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -4,5 +4,7 @@
 
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" />
+    <application android:usesCleartextTraffic="true" tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" >
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
 </manifest>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -9,9 +9,13 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" tools:node="remove"/>
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
 
+    <uses-permission android:name="android.vending.CHECK_LICENSE" tools:node="remove"/>
+
     <application
         android:name="com.hamagen.MainApplication"
         android:label="@string/app_name"
@@ -41,8 +45,6 @@
 
         <meta-data android:name="com.transistorsoft.locationmanager.license" android:value="@string/transistorsoft_key" />
 
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-
         <service
             android:name="io.invertase.firebase.messaging.RNFirebaseMessagingService"
             android:exported="false"

diff --git a/android/app/src/main/java/com/hamagen/MainApplication.java b/android/app/src/main/java/com/hamagen/MainApplication.java
@@ -17,7 +17,7 @@
 import android.content.IntentFilter;
 import io.rumors.reactnativesettings.receivers.GpsLocationReceiver;
 import io.rumors.reactnativesettings.receivers.AirplaneModeReceiver;
-import com.wix.specialble.SpecialBlePackage;
+import moh.gov.il.specialble.SpecialBlePackage;
 
 import com.facebook.react.modules.i18nmanager.I18nUtil;
 import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;

diff --git a/android/app/src/main/res/mipmap-hdpi/notification_big.png b/android/app/src/main/res/mipmap-hdpi/notification_big.png
diff --git a/android/app/src/main/res/mipmap-hdpi/notification_small.png b/android/app/src/main/res/mipmap-hdpi/notification_small.png
diff --git a/android/app/src/main/res/mipmap-mdpi/notification_big.png b/android/app/src/main/res/mipmap-mdpi/notification_big.png
diff --git a/android/app/src/main/res/mipmap-mdpi/notification_small.png b/android/app/src/main/res/mipmap-mdpi/notification_small.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/notification_big.png b/android/app/src/main/res/mipmap-xhdpi/notification_big.png
diff --git a/android/app/src/main/res/mipmap-xhdpi/notification_small.png b/android/app/src/main/res/mipmap-xhdpi/notification_small.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/notification_big.png b/android/app/src/main/res/mipmap-xxhdpi/notification_big.png
diff --git a/android/app/src/main/res/mipmap-xxhdpi/notification_small.png b/android/app/src/main/res/mipmap-xxhdpi/notification_small.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/notification_big.png b/android/app/src/main/res/mipmap-xxxhdpi/notification_big.png
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/notification_small.png b/android/app/src/main/res/mipmap-xxxhdpi/notification_small.png
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -294,8 +294,6 @@ PODS:
     - React
   - react-native-netinfo (5.6.2):
     - React
-  - react-native-network-info (5.2.1):
-    - React
   - react-native-safe-area-context (0.7.3):
     - React
   - react-native-settings (0.2.3):
@@ -306,7 +304,7 @@ PODS:
     - React
   - react-native-uuid-generator (6.1.1):
     - React
-  - react-native-webview (9.4.0):
+  - react-native-webview (10.7.0):
     - React
   - React-RCTActionSheet (0.61.5):
     - React-Core/RCTActionSheetHeaders (= 0.61.5)
@@ -345,8 +343,6 @@ PODS:
     - ReactCommon/jscallinvoker (= 0.61.5)
   - rn-contact-tracing (0.0.3):
     - React
-  - rn-fetch-blob (0.12.0):
-    - React-Core
   - RNBackgroundFetch (2.7.1):
     - React
   - RNBackgroundGeolocation (3.4.2):
@@ -377,10 +373,6 @@ PODS:
     - React
   - RNScreens (2.0.0-beta.2):
     - React
-  - RNSha1 (1.2.3):
-    - React
-  - RNWifi (2.4.0):
-    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -414,7 +406,6 @@ DEPENDENCIES:
   - react-native-google-maps (from `../node_modules/react-native-maps`)
   - react-native-maps (from `../node_modules/react-native-maps`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
-  - react-native-network-info (from `../node_modules/react-native-network-info`)
   - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
   - react-native-settings (from `../node_modules/react-native-settings`)
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
@@ -433,7 +424,6 @@ DEPENDENCIES:
   - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
   - rn-contact-tracing (from `../node_modules/rn-contact-tracing`)
-  - rn-fetch-blob (from `../node_modules/rn-fetch-blob`)
   - RNBackgroundFetch (from `../node_modules/react-native-background-fetch`)
   - RNBackgroundGeolocation (from `../node_modules/react-native-background-geolocation`)
   - RNBluetoothStateManager (from `../node_modules/react-native-bluetooth-state-manager`)
@@ -445,8 +435,6 @@ DEPENDENCIES:
   - RNPermissions (from `../node_modules/react-native-permissions`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
-  - RNSha1 (from `../node_modules/react-native-sha1`)
-  - RNWifi (from `../node_modules/react-native-wifi-reborn`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -517,8 +505,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-maps"
   react-native-netinfo:
     :path: "../node_modules/@react-native-community/netinfo"
-  react-native-network-info:
-    :path: "../node_modules/react-native-network-info"
   react-native-safe-area-context:
     :path: "../node_modules/react-native-safe-area-context"
   react-native-settings:
@@ -553,8 +539,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon"
   rn-contact-tracing:
     :path: "../node_modules/rn-contact-tracing"
-  rn-fetch-blob:
-    :path: "../node_modules/rn-fetch-blob"
   RNBackgroundFetch:
     :path: "../node_modules/react-native-background-fetch"
   RNBackgroundGeolocation:
@@ -577,10 +561,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-reanimated"
   RNScreens:
     :path: "../node_modules/react-native-screens"
-  RNSha1:
-    :path: "../node_modules/react-native-sha1"
-  RNWifi:
-    :path: "../node_modules/react-native-wifi-reborn"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -625,13 +605,12 @@ SPEC CHECKSUMS:
   react-native-google-maps: 0a989abda71059db2caa98b9dacca7a8f38a47d0
   react-native-maps: f4b89da81626ad7f151a8bfcb79733295d31ce5c
   react-native-netinfo: 73303369946c2487c600418961bfdc87748b832f
-  react-native-network-info: d1290ffc0bd0709e11436f5b8d7f605dcc5c4530
   react-native-safe-area-context: e200d4433aba6b7e60b52da5f37af11f7a0b0392
   react-native-settings: 67977214c0f7d6062ad25581107c16a7a27af2a8
   react-native-splash-screen: f15e2d96fd6afc5c882b1dd0b443d07295e2c7c5
   react-native-sqlite-storage: f06bfba10f67f989c00b6a699b9c2b80a816edbe
   react-native-uuid-generator: 82ffa2a1cac94242ebed52c4dedc5044d3412717
-  react-native-webview: cf5527893252b3b036eea024a1da6996f7344c74
+  react-native-webview: 6edf4d6f71b9161fc3e96083726a538ee395304d
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -642,8 +621,7 @@ SPEC CHECKSUMS:
   React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
   React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
-  rn-contact-tracing: fe147c2be110646d1aa401e15c0065ad1bc25fd8
-  rn-fetch-blob: f065bb7ab7fb48dd002629f8bdcb0336602d3cba
+  rn-contact-tracing: fd7e7233fab1ca54d5ef61ce5ecec21aac111349
   RNBackgroundFetch: 8d8d66b47eafcb9e772b2eb95057939038b3ef95
   RNBackgroundGeolocation: 8f0a20788100fbf08987d80f2053ae6eba79c566
   RNBluetoothStateManager: f38ca64bd09d3028b596cb080b89a388207b62a0
@@ -655,8 +633,6 @@ SPEC CHECKSUMS:
   RNPermissions: ad71dd4f767ec254f2cd57592fbee02afee75467
   RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c
   RNScreens: 5e4758109c6d35f9a009ce72af873df907548020
-  RNSha1: 6de589cd0b0397d0f6248a2e5ee9e5f0d7da38dc
-  RNWifi: 1747f039612dd494192ba6c8bc498606ad9f3ec4
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
 PODFILE CHECKSUM: 837d1b8bd2e1fdf1485b9358860cb5287bda5d36

diff --git a/ios/codeAgainstCorona.xcodeproj/project.pbxproj b/ios/codeAgainstCorona.xcodeproj/project.pbxproj
@@ -293,7 +293,7 @@
 					};
 					D52A57BF24203FBB00521B22 = {
 						DevelopmentTeam = N3P977USJJ;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
@@ -554,12 +554,12 @@
 				CODE_SIGN_ENTITLEMENTS = "codeAgainstCorona/Code against corona.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 96;
+				CURRENT_PROJECT_VERSION = 104;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = N3P977USJJ;
 				INFOPLIST_FILE = codeAgainstCorona/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.2.6;
+				MARKETING_VERSION = 2.2.14;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -585,11 +585,11 @@
 				CODE_SIGN_ENTITLEMENTS = "המגןRelease.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 96;
+				CURRENT_PROJECT_VERSION = 104;
 				DEVELOPMENT_TEAM = N3P977USJJ;
 				INFOPLIST_FILE = codeAgainstCorona/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.2.6;
+				MARKETING_VERSION = 2.2.14;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -711,9 +711,9 @@
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = "המגן QA.entitlements";
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 96;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				CURRENT_PROJECT_VERSION = 104;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = N3P977USJJ;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -725,15 +725,15 @@
 				INFOPLIST_FILE = "codeAgainstCorona/Info-qa.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.2.6;
+				MARKETING_VERSION = 2.2.14;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.hamagen.qa;
 				PRODUCT_NAME = "Hamagen QA";
-				PROVISIONING_PROFILE_SPECIFIER = "Hamagen QA Dev";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "codeAgainstCorona-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -751,7 +751,7 @@
 				CODE_SIGN_ENTITLEMENTS = "המגן QA.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 96;
+				CURRENT_PROJECT_VERSION = 104;
 				DEVELOPMENT_TEAM = N3P977USJJ;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -762,7 +762,7 @@
 				INFOPLIST_FILE = "codeAgainstCorona/Info-qa.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.2.6;
+				MARKETING_VERSION = 2.2.14;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/ios/codeAgainstCorona/Info-qa.plist b/ios/codeAgainstCorona/Info-qa.plist
@@ -63,9 +63,9 @@
 		</dict>
 	</dict>
 	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>יש לאפשר גישה לבלוטות' על מנת להשוות את נתיבך אל מול נתיבי חולי קורונה מאומתים</string>
+	<string>גישה לבלוטות' נדרשת לצורך זיהוי קרבה בין מכשירים</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>יש לאפשר גישה לבלוטות' על מנת להשוות את נתיבך אל מול נתיבי חולי קורונה מאומתים</string>
+	<string>גישה לבלוטות' נדרשת לצורך זיהוי קרבה בין מכשירים</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>יש לאפשר גישה למיקום על מנת להשוות את נתיבך אל מול נתיבי חולי קורונה מאומתים</string>
 	<key>NSLocationAlwaysUsageDescription</key>
@@ -86,7 +86,6 @@
 		<string>audio</string>
 		<string>bluetooth-central</string>
 		<string>bluetooth-peripheral</string>
-		<string>external-accessory</string>
 		<string>fetch</string>
 		<string>location</string>
 		<string>processing</string>

diff --git a/ios/codeAgainstCorona/Info.plist b/ios/codeAgainstCorona/Info.plist
@@ -63,9 +63,9 @@
 		</dict>
 	</dict>
 	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>יש לאפשר גישה לבלוטות' על מנת להשוות את נתיבך אל מול נתיבי חולי קורונה מאומתים</string>
+	<string>גישה לבלוטות' נדרשת לצורך זיהוי קרבה בין מכשירים</string>
 	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>יש לאפשר גישה לבלוטות' על מנת להשוות את נתיבך אל מול נתיבי חולי קורונה מאומתים</string>
+	<string>גישה לבלוטות' נדרשת לצורך זיהוי קרבה בין מכשירים</string>
 	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
 	<string>יש לאפשר גישה למיקום על מנת להשוות את נתיבך אל מול נתיבי חולי קורונה מאומתים</string>
 	<key>NSLocationAlwaysUsageDescription</key>
@@ -85,7 +85,6 @@
 	<array>
 		<string>bluetooth-central</string>
 		<string>bluetooth-peripheral</string>
-		<string>external-accessory</string>
 		<string>fetch</string>
 		<string>location</string>
 		<string>processing</string>