react-native-flyy 1.4.31 → 1.4.32

package/android/.project

@@ -16,7 +16,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1669120607692</id>
+			<id>1677845705733</id>
 			<name></name>
 			<type>30</type>
 			<matcher>

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,14 +1,11 @@
-=\=\=\=\=\=\=
-<<<<<<<=HEAD
->>>>>>>=8de27b58ec74995153ebd5af42ae09466551c370
-arguments=--init-script /var/folders/n9/31n7nnjj1hv40f0brcc_4g8w0000gn/T/d146c9752a26f79b52047fb6dc6ed385d064e120494f96f08ca63a317c41f94c.gradle --init-script /var/folders/n9/31n7nnjj1hv40f0brcc_4g8w0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle
+arguments=
 auto.sync=false
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
 connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
-java.home=/Library/Java/JavaVirtualMachines/jdk-11.0.16.jdk/Contents/Home
+java.home=/Library/Java/JavaVirtualMachines/temurin-11.jdk/Contents/Home
 jvm.arguments=
 offline.mode=false
 override.workspace.settings=true

package/android/build.gradle

@@ -134,7 +134,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
   //Flyy sdk dependency
-  implementation 'com.github.roid-software:flyy-sdk:1.4.54.51'
+  implementation 'com.github.roid-software:flyy-sdk:1.4.54.64'
 //  implementation project(path: ':flyy')
 
   implementation 'com.google.code.gson:gson:2.8.7'

package/android/src/main/java/com/reactnativeflyy/FlyyModule.kt

@@ -25,9 +25,7 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
   var STAGE = "STAGE"
   var PRODUCTION = "PRODUCTION"
-  var extUid: String? = ""
-  var extPartnerId: String? = ""
-  var extEnvironment: Int = 0
+
   var map = Arguments.createMap()
 
   override fun getName(): String {
@@ -45,42 +43,7 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
   @ReactMethod
   fun initSDK(partnerToken: String?, environment: Int) {
-      extPartnerId = partnerToken
-      extEnvironment = environment
-    Flyy.init(context, partnerToken, environment)
-    setSharedPref()
-  }
-
-  private fun setSharedPref(){
-    val sharedPreference =  context?.getSharedPreferences("flyy_floating_widget_configuration",Context.MODE_PRIVATE)
-    var occurrence = sharedPreference?.getInt("flyy_app_occurrence",1)
-    if (occurrence != null) {
-      occurrence += 1
-      var editor = sharedPreference?.edit()
-      editor?.putInt("flyy_app_occurrence",occurrence)
-      editor?.commit()
-    };
-  }
-
-  @ReactMethod
-  fun getAppOccurence(type : Int?, promise: Promise) {
-    val sharedPreference =  context?.getSharedPreferences("flyy_floating_widget_configuration",Context.MODE_PRIVATE)
-    if(type == 1){
-      var editor = sharedPreference?.edit()
-      editor?.putInt("flyy_app_occurrence",1)
-      editor?.commit()
-    }
-    var occurrence = sharedPreference?.getInt("flyy_app_occurrence",0)
-    promise.resolve(occurrence)
-  }
-
-//Init method with Callback
-  @ReactMethod
-  fun initSDKWithCallback(partnerToken: String?, environment: Int, InitCallback: Callback) {
-      extPartnerId = partnerToken
-      extEnvironment = environment
     Flyy.init(context, partnerToken, environment)
-    InitCallback.invoke("true")
   }
 
   @ReactMethod
@@ -119,8 +82,6 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
   @ReactMethod
   fun initSDKWithReferralCallback(partnerToken: String?, environment: Int, referralCallBack: Callback) {
-    extPartnerId = partnerToken
-    extEnvironment = environment
     Flyy.init(context, partnerToken, environment, object : FlyyReferrerDataListener {
       override fun onReferrerDataReceived(referrerData: String) {
         //referralCallBack.invoke(referrerData)
@@ -142,20 +103,16 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
   @ReactMethod
   fun setNewUser(externalUserId: String?) {
-    extUid = externalUserId
     Flyy.setNewUser(externalUserId)
   }
 
   @ReactMethod
-  fun setNewUserWithCallBack(externalUserId: String?, promise: Promise) {
-  extUid = externalUserId
-  Flyy.setNewUser(externalUserId, OnFlyyTaskComplete {
-       promise.resolve("success")
-     })
+  fun setNewUserWithCallBack(externalUserId: String?, successCallBack: Callback) {
+    Flyy.setNewUser(externalUserId, OnFlyyTaskComplete {
+      successCallBack.invoke("success")
+    })
   }
 
-  
-
   @ReactMethod
   fun setNewUserWithSegment(externalUserId: String?, segmentId: String?, successCallBack: Callback) {
     Flyy.setNewUser(externalUserId, segmentId, OnFlyyTaskComplete {
@@ -165,21 +122,18 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
 
   @ReactMethod
   fun setUser(externalUserId: String?) {
-    extUid = externalUserId
     Flyy.setUser(externalUserId)
   }
-   
+
   @ReactMethod
-  fun setUserWithCallBack(externalUserId: String?, promise: Promise) {
-    extUid = externalUserId
+  fun setUserWithCallBack(externalUserId: String?, successCallBack: Callback) {
     Flyy.setUser(externalUserId, OnFlyyTaskComplete {
-      promise.resolve(true)
+      successCallBack.invoke("success")
     })
   }
 
   @ReactMethod
   fun setUserWithSegment(externalUserId: String?, segmentId: String?, successCallBack: Callback) {
-    extUid = externalUserId
     Flyy.setUser(externalUserId, segmentId, OnFlyyTaskComplete {
       successCallBack.invoke("success")
     })
@@ -329,11 +283,6 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     openFlyyRouteActivity(FlyyRouteActivity.FLYY_QUIZ_PAGE, null)
   }
 
-  //@ReactMethod
-  //fun setCustomFont(regularFont: String?, mediumFont: String?, boldFont: String?) {
-  // Flyy.setCustomFontName(regularFont,mediumFont, boldFont);
-  //}
-
   @ReactMethod
   fun openFlyyQuizHistoryPage() {
     openFlyyRouteActivity(FlyyRouteActivity.FLYY_QUIZ_HISTORY_PAGE, null)
@@ -391,11 +340,6 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     openFlyyRouteActivity(FlyyRouteActivity.FLYY_BONANZA_PAGE, null)
   }
 
-  @ReactMethod
-  fun openCheckinScreen() {
-    openFlyyRouteActivity(FlyyRouteActivity.FLYY_OPEN_CHECKIN_PAGE, null)
-  }
-
   @ReactMethod
   fun verifyReferralCode(referralCode: String?, successCallBack: Callback) {
     Flyy.verifyReferralCode(context, referralCode, FlyyVerifyReferralCode { isValid, referralCode ->
@@ -522,21 +466,6 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
     })
   }
 
-  @ReactMethod
-  fun openLeaderBoardHistory() {
-    openFlyyRouteActivity(FlyyRouteActivity.FLYY_OPEN_LEADERBOARD_HISTORY, null)
-  }
-
-  @ReactMethod
-  fun openFlyyGamesPage() {
-    openFlyyRouteActivity(FlyyRouteActivity.FLYY_OPEN_TOURNAMENT_LIST, null)
-  }
-
-  @ReactMethod
-  fun openFlyyGamesHistory() {
-    openFlyyRouteActivity(FlyyRouteActivity.FLYY_OPEN_TOURNAMENT_HISTORY, null)
-  }
-
   @ReactMethod
   fun getScratchCardCount(callBack: Callback) {
     Flyy.getScratchCardCount(context, object : FlyyFetchScratchCardCountListener {
@@ -560,46 +489,40 @@ class FlyyModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaMo
   }
 
   @ReactMethod
-fun getPreviousLeaderboardWinners(tag: String, callBack: Callback) {
-  Flyy.getPreviousLeaderboardWinners(context, tag, object : FlyyFetchLeaderboardDataListner {
-    override fun onSuccess(flyyLeaderboardData: FlyyLeaderboardData?) {
-      val resultData: WritableMap = WritableNativeMap()
-      flyyLeaderboardData?.participantsCount?.let { resultData.putInt("participants_count", it) }
-
-      val gson = Gson()
-      if(flyyLeaderboardData != null && flyyLeaderboardData.winners.isNotEmpty()) {
-        val winnersArray: WritableArray = WritableNativeArray()
-        val winnersObj = flyyLeaderboardData.winners
-       if(winnersObj != null){
-         for (winners in flyyLeaderboardData.winners) {
-           val winnerData = JSONObject(gson.toJson(winners))
-           val wm = convertJsonToMap(winnerData)
-           winnersArray.pushMap(wm)
-         }
-       }
-        resultData.putArray("winners", winnersArray)
-      }
+  fun getPreviousLeaderboardWinners(tag: String, callBack: Callback) {
+    Flyy.getPreviousLeaderboardWinners(context, tag, object : FlyyFetchLeaderboardDataListner {
+      override fun onSuccess(flyyLeaderboardData: FlyyLeaderboardData?) {
+        val resultData: WritableMap = WritableNativeMap()
+        flyyLeaderboardData?.participantsCount?.let { resultData.putInt("participants_count", it) }
+
+        val gson = Gson()
+        if(flyyLeaderboardData?.winners != null && flyyLeaderboardData?.winners.count() > 0) {
+          val winnersArray: WritableArray = WritableNativeArray()
+          for (winners in flyyLeaderboardData.winners) {
+            val winnerData = JSONObject(gson.toJson(winners))
+            val wm = convertJsonToMap(winnerData)
+            winnersArray.pushMap(wm)
+          }
+          resultData.putArray("winners", winnersArray)
+        }
 
-      if(flyyLeaderboardData?.previousWinners != null && flyyLeaderboardData.previousWinners.isNotEmpty()) {
-        val previousWinnersArray: WritableArray = WritableNativeArray()
-        val previousWinnersObj = flyyLeaderboardData.previousWinners
-       if(previousWinnersObj != null){
-         for (previousWinners in flyyLeaderboardData.winners) {
-           val winnerData = JSONObject(gson.toJson(previousWinners))
-           val wm = convertJsonToMap(winnerData)
-           previousWinnersArray.pushMap(wm)
-         }
-       }
-        resultData.putArray("previous_winners", previousWinnersArray)
+        if(flyyLeaderboardData?.previousWinners != null && flyyLeaderboardData?.previousWinners.count() > 0) {
+          val previousWinnersArray: WritableArray = WritableNativeArray()
+          for (previousWinners in flyyLeaderboardData.winners) {
+            val winnerData = JSONObject(gson.toJson(previousWinners))
+            val wm = convertJsonToMap(winnerData)
+            previousWinnersArray.pushMap(wm)
+          }
+          resultData.putArray("previous_winners", previousWinnersArray)
+        }
+        callBack.invoke(resultData)
       }
-      callBack.invoke(resultData)
-    }
 
-    override fun onFailure(message: String) {
-      callBack.invoke(message)
-    }
-  })
-}
+      override fun onFailure(message: String) {
+        callBack.invoke(message)
+      }
+    })
+  }
 
   @ReactMethod
   fun getLeaderboardParticipants(tag: String, callBack: Callback) {
@@ -609,28 +532,22 @@ fun getPreviousLeaderboardWinners(tag: String, callBack: Callback) {
         flyyLeaderboardData?.participantsCount?.let { resultData.putInt("participants_count", it) }
 
         val gson = Gson()
-        if(flyyLeaderboardData != null && flyyLeaderboardData.winners.isNotEmpty()) {
+        if(flyyLeaderboardData?.winners != null && flyyLeaderboardData?.winners.count() > 0) {
           val winnersArray: WritableArray = WritableNativeArray()
-          val winnersObj = flyyLeaderboardData.winners
-          if(winnersObj != null){
-            for (winners in flyyLeaderboardData.winners) {
-              val winnerData = JSONObject(gson.toJson(winners))
-              val wm = convertJsonToMap(winnerData)
-              winnersArray.pushMap(wm)
-            }
+          for (winners in flyyLeaderboardData.winners) {
+            val winnerData = JSONObject(gson.toJson(winners))
+            val wm = convertJsonToMap(winnerData)
+            winnersArray.pushMap(wm)
           }
           resultData.putArray("winners", winnersArray)
         }
 
-        if(flyyLeaderboardData != null && flyyLeaderboardData.previousWinners.isNotEmpty()) {
+        if(flyyLeaderboardData?.previousWinners != null && flyyLeaderboardData?.previousWinners.count() > 0) {
           val previousWinnersArray: WritableArray = WritableNativeArray()
-          val previousWinnersObj = flyyLeaderboardData.previousWinners
-          if(previousWinnersObj != null){
-            for (previousWinners in flyyLeaderboardData.winners) {
-              val winnerData = JSONObject(gson.toJson(previousWinners))
-              val wm = convertJsonToMap(winnerData)
-              previousWinnersArray.pushMap(wm)
-            }
+          for (previousWinners in flyyLeaderboardData.winners) {
+            val winnerData = JSONObject(gson.toJson(previousWinners))
+            val wm = convertJsonToMap(winnerData)
+            previousWinnersArray.pushMap(wm)
           }
           resultData.putArray("previous_winners", previousWinnersArray)
         }
@@ -660,11 +577,6 @@ fun getPreviousLeaderboardWinners(tag: String, callBack: Callback) {
     })
   }
 
-  @ReactMethod
-  fun getPartnerId(successCallBack: Callback) {
-    successCallBack.invoke("Hello")
-  }
-
   @ReactMethod
   fun getReferrerDetails(callBack: Callback) {
     Flyy.getReferrerDetails(context, object : FlyyFetchReferrerDetailsListener {
@@ -786,24 +698,6 @@ fun getPreviousLeaderboardWinners(tag: String, callBack: Callback) {
     }
   }
 
-  @ReactMethod
-  fun getUserData(promise: Promise) {
-     val resultData: WritableMap = WritableNativeMap()
-        resultData.putString("partner_id", extPartnerId)
-        resultData.putString("user_id", extUid)
-        resultData.putInt("environment", extEnvironment)
-   try {
-        promise.resolve(resultData)
-    } catch (e: Throwable) {
-        promise.reject("Create Event Error", e)
-    }
-  }
-
-  @ReactMethod
-  fun getAppData(promise: Promise) {
-    promise.resolve(Flyy.getAppData())
-  }
-
   @Throws(JSONException::class)
   private fun convertMapToJson(readableMap: ReadableMap?): JSONObject? {
     val `object` = JSONObject()

package/android/src/main/java/com/reactnativeflyy/FlyyRouteActivity.java

@@ -30,10 +30,6 @@ public class FlyyRouteActivity extends AppCompatActivity {
   public static final String FLYY_BONANZA_PAGE = "flyy_bonanza_page";
   public static final String FLYY_OPEN_RAFFLE_PAGE = "flyy_open_raffle_page";
   public static final String FLYY_OPEN_SPINTHEWHEEL_PAGE = "flyy_open_spinthewheel_page";
-  public static final String FLYY_OPEN_CHECKIN_PAGE = "flyy_open_checkin_page";
-  public static final String FLYY_OPEN_LEADERBOARD_HISTORY = "flyy_open_leaderboard_history";
-  public static final String FLYY_OPEN_TOURNAMENT_LIST = "flyy_open_tournament_list";
-  public static final String FLYY_OPEN_TOURNAMENT_HISTORY = "flyy_open_tournament_history";
 
   @Override
   protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -99,18 +95,6 @@ public class FlyyRouteActivity extends AppCompatActivity {
         case FLYY_OPEN_RAFFLE_PAGE:
           Flyy.navigateToRaffleDetailActivity(this, OFFER_ID);
           break;
-        case FLYY_OPEN_CHECKIN_PAGE:
-          Flyy.navigateToCheckInActivity(this);
-          break;
-        case FLYY_OPEN_LEADERBOARD_HISTORY:
-          Flyy.navigateToLeaderBoardHistoryActivity(this);
-          break;
-        case FLYY_OPEN_TOURNAMENT_LIST:
-          Flyy.navigateToTournamentListActivity(this,null);
-          break;
-        case FLYY_OPEN_TOURNAMENT_HISTORY:
-          Flyy.navigateToTournamentHistoryActivity(this,null);
-          break;
         default:
           throw new IllegalStateException("Unexpected value: " + activityToOpen);
       }