Merged in stage (pull request #215)

version update, story - MRN-793, MRN-802

Approved-by: vanitha.g

Author: karthikeyan-se-contus

.gitignore

@@ -87,4 +87,4 @@ mirrorfly-uikit-react-native-*.tgz
 !.yarn/sdks
 !.yarn/versions
 
-patches/react-native-network-logger+1.16.1.patch
+patches/react-native-network-logger+1.16.1.patch

ReactotronConfig.js

@@ -0,0 +1,10 @@
+import Reactotron from 'reactotron-react-native';
+
+Reactotron.configure() // controls connection & communication settings
+   .useReactNative({
+      networking: {
+         // optionally, you can turn it off with false.
+         ignoreUrls: /symbolicate/,
+   },
+   }) // add all built-in react native plugins
+   .connect(); // let's connect!

android/app/build.gradle

@@ -5,6 +5,8 @@ apply plugin: "com.facebook.react"
 /** Add this Firebase intialize */
 apply plugin: 'com.google.gms.google-services'
 
+apply plugin: "kotlin-android"
+
 /**
  * This is the configuration block to customize your React Native Android app.
  * By default you don't need to apply any configuration, just uncomment the lines you need.
@@ -86,7 +88,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "3.0.1"
+        versionName "3.0.16"
         /** Add this for react-native-camera */
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
@@ -124,6 +126,13 @@ dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
 
+    implementation 'com.squareup.retrofit2:retrofit:2.1.0'
+    implementation 'com.google.code.gson:gson:2.6.2'
+    implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.4.1'
+
+    // exclude group:'com.squareup.okhttp3', module:'okhttp'
+
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {

android/app/src/main/AndroidManifest.xml

@@ -34,6 +34,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_CONNECTED_DEVICE"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -112,7 +113,7 @@
         <service
             android:name="app.notifee.core.ForegroundService"
             android:exported="false"
-            android:foregroundServiceType="mediaPlayback|camera|microphone|connectedDevice|shortService"
+            android:foregroundServiceType="mediaPlayback|camera|microphone|connectedDevice|shortService|dataSync"
             tools:replace="android:foregroundServiceType"
         />
     </application>

android/app/src/main/java/com/mirrorfly_rn/APIClient.kt

@@ -0,0 +1,39 @@
+package com.mirrorfly_rn
+
+import okhttp3.OkHttpClient
+import okhttp3.RequestBody
+import okhttp3.ResponseBody
+import okhttp3.logging.HttpLoggingInterceptor
+import retrofit2.Call
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.PUT
+import retrofit2.http.Url
+
+
+class APIClient {
+    private var retrofit: Retrofit? = null
+
+    fun getClient(baseUrl:String): Retrofit? {
+        val interceptor = HttpLoggingInterceptor()
+        interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
+        val client: OkHttpClient = OkHttpClient.Builder().addInterceptor(interceptor).build()
+        retrofit = Retrofit.Builder()
+            .baseUrl(baseUrl)
+            .addConverterFactory(GsonConverterFactory.create())
+            .client(client)
+            .build()
+        return retrofit
+    }
+}
+interface APIInterface {
+    @PUT
+    fun uploadBinaryData(@Url url: String?, @Body binaryData: RequestBody?): Call<ResponseBody?>?
+
+    @GET
+    fun downloadChunkFromPreAuthenticationUrl(@Url url: String?,
+                                              @Header("Range") range: String): Call<ResponseBody>
+}

android/app/src/main/java/com/mirrorfly_rn/CallScreenActivity.kt

@@ -40,10 +40,10 @@ class CallScreenActivity : ReactActivity(), LifecycleEventListener {
     override fun createReactActivityDelegate(): ReactActivityDelegate =
         DefaultReactActivityDelegate(this, mainComponentName, fabricEnabled)
 
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        setIntent(intent)
-    }
+//    override fun onNewIntent(intent: Intent?) {
+//        super.onNewIntent(intent)
+//        setIntent(intent)
+//    }
 
     override fun onResume() {
         Log.d("TAG", "onResume: CallScreenActivity Resume")