Merge pull request #405 from Sunbird-Saral/18(1.3)

18(1.3)
Sunbird-Saral · Sep 29, 2023 · e6da990 · e6da990
2 parents 546bed7 + c435198
commit e6da990
Show file tree

Hide file tree

Showing 16 changed files with 1,265 additions and 1,033 deletions.
diff --git a/Jenkinsfile-prod b/Jenkinsfile-prod
@@ -5,7 +5,7 @@ pipeline {
     stages{
         stage ('checkout') {
             steps {
-               git branch: 'feature/v1-develop', url: 'https://github.com/Sunbird-Saral/Project-Saral.git' 
+               git branch: 'main', url: 'https://github.com/Sunbird-Saral/Project-Saral.git' 
             }
         }
 

diff --git a/v1.0/frontend/SaralApp/android/app/build.gradle b/v1.0/frontend/SaralApp/android/app/build.gradle
@@ -134,8 +134,8 @@ android {
         applicationId "com.saralapp"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode 18
+        versionName "1.3"
     }
     configurations.all {
             resolutionStrategy {

diff --git a/v1.0/frontend/SaralApp/android/app/google-services.json b/v1.0/frontend/SaralApp/android/app/google-services.json
diff --git a/v1.0/frontend/SaralApp/android/app/release/output-metadata.json b/v1.0/frontend/SaralApp/android/app/release/output-metadata.json
@@ -0,0 +1,18 @@
+{
+  "version": 2,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.saralapp",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ]
+}
diff --git a/v1.0/frontend/SaralApp/android/app/src/main/AndroidManifest.xml b/v1.0/frontend/SaralApp/android/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
 
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
@@ -15,7 +16,7 @@
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+
 
     <application
       android:name=".MainApplication"
@@ -32,6 +33,7 @@
         android:label="@string/app_name"
         android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
         android:launchMode="singleTask"
+        android:exported="true"
         android:windowSoftInputMode="adjustResize">
         <intent-filter>
             <action android:name="android.intent.action.MAIN" />
@@ -54,24 +56,26 @@
       <meta-data
        android:name="firebase_analytics_collection_enabled"
        android:value="true" 
+       android:exported="true"
        tools:replace="android:value"/>
 
       <meta-data
       android:name="firebase_crashlytics_collection_enabled"
       android:value="true" 
+      android:exported="true"
       tools:replace="android:value"/>
 
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions" />
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher" />
-        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver">
+        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationActions"  android:exported="true"/>
+        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationPublisher"  android:exported="true"/>
+        <receiver android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationBootEventReceiver"  android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
         <service
             android:name="com.dieam.reactnativepushnotification.modules.RNPushNotificationListenerService"
-            android:exported="false" >
+            android:exported="true" >
             <intent-filter>
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>

diff --git a/v1.0/frontend/SaralApp/android/build.gradle b/v1.0/frontend/SaralApp/android/build.gradle
@@ -4,10 +4,10 @@ buildscript {
     ext {
         googlePlayServicesVersion = "+" // default: "+"
         firebaseMessagingVersion = "21.1.0" // default: "21.1.0"
-        buildToolsVersion = "30.0.2"
+        buildToolsVersion = "33.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 30
-        targetSdkVersion = 30
+        compileSdkVersion = 33
+        targetSdkVersion = 33
         ndkVersion = "20.1.5948944"
         androidXCore = "1.7.0"
     }

diff --git a/v1.0/frontend/SaralApp/android/gradle.properties b/v1.0/frontend/SaralApp/android/gradle.properties
@@ -26,10 +26,10 @@ android.enableJetifier=true
 android.enableR8.fullMode =true
 
 # APK Signing
-MYAPP_RELEASE_STORE_FILE=hwrecog-upload-key.keystore
-MYAPP_RELEASE_STORE_PASSWORD=tarento@mis
-MYAPP_RELEASE_KEY_ALIAS=hwrecog-key-alias
-MYAPP_RELEASE_KEY_PASSWORD=tarento@mis
+MYAPP_RELEASE_STORE_FILE=saral-up.keystore
+MYAPP_RELEASE_STORE_PASSWORD=tspl1234
+MYAPP_RELEASE_KEY_ALIAS=up-saral-app
+MYAPP_RELEASE_KEY_PASSWORD=tspl1234
 
 # Version of flipper SDK to use with React Native
 FLIPPER_VERSION=0.93.0

diff --git a/v1.0/frontend/SaralApp/package.json b/v1.0/frontend/SaralApp/package.json
@@ -29,6 +29,7 @@
     "react-native-global-props": "^1.1.5",
     "react-native-localization": "^2.3.1",
     "react-native-modal-dropdown": "^1.0.2",
+    "react-native-permissions": "^3.9.0",
     "react-native-push-notification": "^8.1.1",
     "react-native-responsive-dimensions": "^3.1.1",
     "react-native-safe-area-context": "^3.1.9",

diff --git a/v1.0/frontend/SaralApp/saralAppInfo.json b/v1.0/frontend/SaralApp/saralAppInfo.json
@@ -1,5 +1,5 @@
 {
-  "saral.release.version": "v1.6.0",
+  "saral.release.version": "v1.6.1",
   "saral.info": "Sunbird Saral is a OCR plus mobile application to physitize data from physical layout.",
   "saral.documentation.link": "https://saral.sunbird.org/",
   "release.link": "https://saral.sunbird.org/engage/releases"

diff --git a/v1.0/frontend/SaralApp/src/configs/config.js b/v1.0/frontend/SaralApp/src/configs/config.js
@@ -4,7 +4,7 @@ const configs = {
 
 export default configs;
 
-export const apkVersion = '1.6.0';
-export const apkVersionId = '1';
+export const apkVersion = '1.6.1';
+export const apkVersionId = '1.3';
 export const apkURL =
-  'http://play.google.com/store/apps/details?id=com.up_saraldata';
+  'https://play.google.com/store/apps/details?id=com.up_saralapp';