@infilectorg/infiviz-shots-react-sdk 1.0.15 → 1.0.17

package/README.md

@@ -5,10 +5,6 @@
 Following are the versions for **React Native SDK**
 
 
-- **V 1.0.12**<br/>
-1. [Android React SDK | Change SyncEvent to return both temp and universal session ids on sync completed event](https://infilect.atlassian.net/browse/ISS-4879)
-   Change SyncEvent to return both temp and universal session ids
-
 - **V 1.0.11** <br/>
 1. [Fixed startCamera not returning sessionId in android]
 

package/android/build.gradle

@@ -64,13 +64,11 @@ android {
 
   buildTypes {
     release {
-      debuggable false
       minifyEnabled true
       proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
     }
     debug {
       minifyEnabled false
-      debuggable true
     }
   }
 
@@ -79,8 +77,8 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
   }
 
   sourceSets {
@@ -104,7 +102,8 @@ dependencies {
   implementation 'com.google.android.material:material:1.12.0'
   implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
 
-  implementation 'com.infilect:infivizshots-sdk:RN-1.0.3'
+
+  implementation 'com.infilect:infivizshots-sdk:RN-1.0.1'
 
   testImplementation 'junit:junit:4.13.2'
   implementation 'com.github.bumptech.glide:glide:4.14.2'
@@ -112,7 +111,7 @@ dependencies {
   implementation 'com.google.code.gson:gson:2.12.1'
   androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
   implementation 'com.facebook.stetho:stetho:1.5.1'
-  implementation "androidx.core:core-ktx:1.13.1"
+  implementation "androidx.core:core-ktx:1.16.0"
 
   // HIlt
   implementation "com.google.dagger:hilt-android:2.42"

package/android/proguard-rules.pro

@@ -127,27 +127,6 @@
     *;
 }
 
-# Keep sealed class SDKEvent and its object instances
--keep class com.infilect.infivizshotsreactsdk.SDKEvent {
-    *;
-}
--keep class com.infilect.infivizshotsreactsdk.SDKEvent$SYNC_EVENT {
-    *;
-}
--keep class com.infilect.infivizshotsreactsdk.SDKEvent$SESSION_RESULT_EVENT {
-    *;
-}
--keep class com.infilect.infivizshotsreactsdk.SDKEvent$ACTION_GENERATED_EVENT {
-    *;
-}
-
-# Keep sealed class constructors and object instances
--keepclassmembers class com.infilect.infivizshotsreactsdk.SDKEvent {
-    public static final com.infilect.infivizshotsreactsdk.SDKEvent$SYNC_EVENT SYNC_EVENT;
-    public static final com.infilect.infivizshotsreactsdk.SDKEvent$SESSION_RESULT_EVENT SESSION_RESULT_EVENT;
-    public static final com.infilect.infivizshotsreactsdk.SDKEvent$ACTION_GENERATED_EVENT ACTION_GENERATED_EVENT;
-}
-
 # Additional memory optimization rules
 -dontusemixedcaseclassnames
 -dontskipnonpubliclibraryclasses

package/android/src/main/java/com/infilect/infivizshotsreactsdk/InfivizShotsReactSdkModule.kt

@@ -49,25 +49,15 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
             val message = intent.getStringExtra(IntentConstants.MESSAGE)
             val sessionId = intent.getStringExtra(IntentConstants.SESSION_ID)
 
-            InfiVizShotsSDK.fetchUniversalSessionId(currentActivity, sessionId, object : SDKCallback<String>{
-                override fun onSuccess(p0: String) {
-                    sendEventToReact(SDKEvent.SYNC_EVENT, sessionId!!, p0, status!!, message!!)
-                }
-
-                override fun onError(p0: SDKExceptions) {
-                    sendEventToReact(SDKEvent.SYNC_EVENT, p0.sessionId, "", p0.status.toString(),
-                        p0.message.toString())
-                }
-            });
+            sendEventToReact(SDKEvent.SYNC_EVENT, sessionId!!, status!!, message!!)
         }
     }
 
     private fun sendEventToReact(
-        eventName: SDKEvent, sessionId: String, universalSessionId: String, status: String, message: String
+        eventName: SDKEvent, sessionId: String, status: String, message: String
     ) {
         val params = Arguments.createMap().apply {
-            putString("temporarySessionId", sessionId)
-            putString("universalSessionId", universalSessionId)
+            putString("sessionId", sessionId)
             putString("status", status)
             putString("message", message)
         }
@@ -135,29 +125,14 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
     fun syncSession(sessionId: String) {
         InfiVizShotsSDK.uploadSession(
             currentActivity!!, arrayListOf(sessionId), object : SDKCallback<String> {
-                override fun onSuccess(syncedSession: String) {
-                    InfiVizShotsSDK.fetchUniversalSessionId(currentActivity!!, sessionId, object : SDKCallback<String> {
-                        override fun onSuccess(universalSessionId: String) {
-                            sendEventToReact(SDKEvent.SYNC_EVENT, syncedSession, universalSessionId,  "200", syncedSession)
-                        }
-
-                        override fun onError(p0: SDKExceptions) {
-                            sendEventToReact(
-                                SDKEvent.SYNC_EVENT,
-                                syncedSession,
-                                "",
-                                p0.status.toString(),
-                                p0.message.toString()
-                            )
-                        }
-                    })
+                override fun onSuccess(p0: String) {
+                    sendEventToReact(SDKEvent.SYNC_EVENT, p0, "200", p0)
                 }
 
                 override fun onError(p0: SDKExceptions) {
                     sendEventToReact(
                         SDKEvent.SYNC_EVENT,
                         p0.sessionId,
-                        "",
                         p0.status.toString(),
                         p0.message.toString()
                     )
@@ -274,22 +249,8 @@ class InfivizShotsReactSdkModule(private val reactContext: ReactApplicationConte
                     promise.reject(sdkExceptions)
                 }
 
-                override fun onSuccess(tempId: String) {
-                    InfiVizShotsSDK.fetchUniversalSessionId(currentActivity!!, tempId, object : SDKCallback<String> {
-                        override fun onSuccess(universalSessionId: String) {
-                            sendEventToReact(SDKEvent.SYNC_EVENT, tempId, universalSessionId,  "200", tempId)
-                        }
-
-                        override fun onError(p0: SDKExceptions) {
-                            sendEventToReact(
-                                SDKEvent.SYNC_EVENT,
-                                tempId,
-                                "",
-                                p0.status.toString(),
-                                p0.message.toString()
-                            )
-                        }
-                    })
+                override fun onSuccess(tempId: String?) {
+                    promise.resolve(tempId)
                 }
             })
     }

package/android/src/main/java/com/infilect/infivizshotsreactsdk/SDKEvent.kt

@@ -1,15 +1,8 @@
 package com.infilect.infivizshotsreactsdk
 
 
-open class SDKEvent(val name: String) {
-     companion object {
-          @JvmField
-          val SYNC_EVENT = SDKEvent("SyncEvent")
-
-          @JvmField
-          val SESSION_RESULT_EVENT = SDKEvent("SessionRealTimeResultEvent")
-
-          @JvmField
-          val ACTION_GENERATED_EVENT = SDKEvent("ActionsGeneratedEvent")
-     }
+sealed class SDKEvent(val name: String) {
+     object SYNC_EVENT : SDKEvent("SyncEvent")
+     object SESSION_RESULT_EVENT: SDKEvent("SessionRealTimeResultEvent")
+     object ACTION_GENERATED_EVENT: SDKEvent("ActionsGeneratedEvent")
 }

package/ios/InfivizShotSDK.xcframework/Info.plist

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>InfivizShotSDK.framework/InfivizShotSDK</string>
 			<key>LibraryIdentifier</key>
 			<string>ios-arm64</string>
 			<key>LibraryPath</key>
@@ -17,8 +19,10 @@
 			<string>ios</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>InfivizShotSDK.framework/InfivizShotSDK</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64-simulator</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>InfivizShotSDK.framework</string>
 			<key>SupportedArchitectures</key>

package/ios/InfivizShotSDK.xcframework/ios-arm64/InfivizShotSDK.framework/Headers/InfivizShotSDK-Swift.h

@@ -368,20 +368,6 @@ SWIFT_CLASS_NAMED("DBActionBucket")
 @end
 
 
-
-@interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
-- (void)insertObject:(DBAction * _Nonnull)value inActionsAtIndex:(NSInteger)idx;
-- (void)removeObjectFromActionsAtIndex:(NSInteger)idx;
-- (void)insertActions:(NSArray<DBAction *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)removeActionsAtIndexes:(NSIndexSet * _Nonnull)indexes;
-- (void)replaceObjectInActionsAtIndex:(NSInteger)idx withObject:(DBAction * _Nonnull)value;
-- (void)replaceActionsAtIndexes:(NSIndexSet * _Nonnull)indexes withActions:(NSArray<DBAction *> * _Nonnull)values;
-- (void)addActionsObject:(DBAction * _Nonnull)value;
-- (void)removeActionsObject:(DBAction * _Nonnull)value;
-- (void)addActions:(NSSet<DBAction *> * _Nonnull)values;
-- (void)removeActions:(NSSet<DBAction *> * _Nonnull)values;
-@end
-
 @class DBActionType;
 
 @interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
@@ -412,6 +398,20 @@ SWIFT_CLASS_NAMED("DBActionBucket")
 - (void)removeComplianceMetrics:(NSSet<DBComplianceMetric *> * _Nonnull)values;
 @end
 
+
+@interface DBActionBucket (SWIFT_EXTENSION(InfivizShotSDK))
+- (void)insertObject:(DBAction * _Nonnull)value inActionsAtIndex:(NSInteger)idx;
+- (void)removeObjectFromActionsAtIndex:(NSInteger)idx;
+- (void)insertActions:(NSArray<DBAction *> * _Nonnull)values atIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)removeActionsAtIndexes:(NSIndexSet * _Nonnull)indexes;
+- (void)replaceObjectInActionsAtIndex:(NSInteger)idx withObject:(DBAction * _Nonnull)value;
+- (void)replaceActionsAtIndexes:(NSIndexSet * _Nonnull)indexes withActions:(NSArray<DBAction *> * _Nonnull)values;
+- (void)addActionsObject:(DBAction * _Nonnull)value;
+- (void)removeActionsObject:(DBAction * _Nonnull)value;
+- (void)addActions:(NSSet<DBAction *> * _Nonnull)values;
+- (void)removeActions:(NSSet<DBAction *> * _Nonnull)values;
+@end
+
 @class DBKpiConfigs;
 @class DBActionData;
 
@@ -804,6 +804,25 @@ SWIFT_CLASS("_TtC14InfivizShotSDK16DBConfigurations")
 @end
 
 
+SWIFT_CLASS_NAMED("DBDemoPhotoData")
+@interface DBDemoPhotoData : NSManagedObject
+- (nonnull instancetype)initWithEntity:(NSEntityDescription * _Nonnull)entity insertIntoManagedObjectContext:(NSManagedObjectContext * _Nullable)context OBJC_DESIGNATED_INITIALIZER;
+@end
+
+
+
+@interface DBDemoPhotoData (SWIFT_EXTENSION(InfivizShotSDK))
+@property (nonatomic, copy) NSString * _Nullable bay;
+@property (nonatomic, copy) NSString * _Nullable categoryName;
+@property (nonatomic, copy) NSString * _Nullable direction;
+@property (nonatomic, copy) NSData * _Nullable image;
+@property (nonatomic) int64_t imageID;
+@property (nonatomic) BOOL isEvidence;
+@property (nonatomic) int64_t setID;
+@property (nonatomic, copy) NSString * _Nullable stack;
+@end
+
+
 SWIFT_CLASS("_TtC14InfivizShotSDK10DBFromStep")
 @interface DBFromStep : NSManagedObject
 - (nonnull instancetype)initWithEntity:(NSEntityDescription * _Nonnull)entity insertIntoManagedObjectContext:(NSManagedObjectContext * _Nullable)context OBJC_DESIGNATED_INITIALIZER;
@@ -1027,6 +1046,7 @@ SWIFT_CLASS("_TtC14InfivizShotSDK14DBSessionImage")
 
 
 
+
 @interface DBSessionImage (SWIFT_EXTENSION(InfivizShotSDK))
 @property (nonatomic) int64_t apiImageID;
 @property (nonatomic, copy) NSString * _Nullable backendSessionID;
@@ -1044,6 +1064,7 @@ SWIFT_CLASS("_TtC14InfivizShotSDK14DBSessionImage")
 @property (nonatomic) BOOL isBlur;
 @property (nonatomic) BOOL isEvidence;
 @property (nonatomic) BOOL isFlash;
+@property (nonatomic) BOOL isLandscape;
 @property (nonatomic) BOOL isSlant;
 @property (nonatomic) BOOL isSurvey;
 @property (nonatomic) BOOL isZoom;
@@ -1058,11 +1079,11 @@ SWIFT_CLASS("_TtC14InfivizShotSDK14DBSessionImage")
 @property (nonatomic, copy) NSString * _Nullable taskPhotoType;
 @property (nonatomic, copy) NSString * _Nullable userName;
 @property (nonatomic, copy) NSString * _Nullable zoomLevel;
-@property (nonatomic) BOOL isLandscape;
+@property (nonatomic, copy) NSString * _Nullable metaData;
 @end
 
 
-SWIFT_CLASS("_TtC14InfivizShotSDK6DBTask")
+SWIFT_CLASS_NAMED("DBTask")
 @interface DBTask : NSManagedObject
 - (nonnull instancetype)initWithEntity:(NSEntityDescription * _Nonnull)entity insertIntoManagedObjectContext:(NSManagedObjectContext * _Nullable)context OBJC_DESIGNATED_INITIALIZER;
 @end
@@ -1202,13 +1223,13 @@ SWIFT_CLASS("_TtC14InfivizShotSDK15SpreadsheetView")
 
 
 @interface SpreadsheetView (SWIFT_EXTENSION(InfivizShotSDK))
-- (void)layoutSubviews;
+- (BOOL)isKindOfClass:(Class _Nonnull)aClass SWIFT_WARN_UNUSED_RESULT;
+- (id _Nullable)forwardingTargetForSelector:(SEL _Null_unspecified)aSelector SWIFT_WARN_UNUSED_RESULT;
 @end
 
 
 @interface SpreadsheetView (SWIFT_EXTENSION(InfivizShotSDK))
-- (BOOL)isKindOfClass:(Class _Nonnull)aClass SWIFT_WARN_UNUSED_RESULT;
-- (id _Nullable)forwardingTargetForSelector:(SEL _Null_unspecified)aSelector SWIFT_WARN_UNUSED_RESULT;
+- (void)layoutSubviews;
 @end