From acb78e38fd5135b03f7ce40f78b495d7412422fa Mon Sep 17 00:00:00 2001
From: "S.Shahsavari" <samanshahsavari3@gmail.com>
Date: Mon, 8 Jul 2024 10:37:21 +0330
Subject: [PATCH] - Version Control implementation bug fix - Ayan Notif
 implementation bug fix

---
 PishkhanHelper/build.gradle                   |   6 +++---
 .../activity/HelperDrawerActivity.kt          |  19 +++++++++++++++++-
 .../pishkhanhelper/app/HelperApplication.kt   |   4 ++--
 .../fragment/login/EnterOtpCodeFragment.kt    |  10 ++++++++-
 .../ayantech/pishkhanhelper/model/AppInfo.kt  |   4 +++-
 .../model/versionControl/AppExtraInfo.kt      |   7 +++++++
 ...olicy.xml => helper_ic_privacy_policy.xml} |   0
 ...xml => helper_ic_terms_and_conditions.xml} |   0
 .../src/main/res/drawable/notif_logo.png      | Bin 0 -> 9010 bytes
 .../res/layout/helper_drawer_activity.xml     |   6 +++---
 .../src/main/res/values/properties.xml        |   6 ++++++
 11 files changed, 51 insertions(+), 11 deletions(-)
 create mode 100644 PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/versionControl/AppExtraInfo.kt
 rename PishkhanHelper/src/main/res/drawable/{ic_privacy_policy.xml => helper_ic_privacy_policy.xml} (100%)
 rename PishkhanHelper/src/main/res/drawable/{ic_terms_and_conditions.xml => helper_ic_terms_and_conditions.xml} (100%)
 create mode 100644 PishkhanHelper/src/main/res/drawable/notif_logo.png
 create mode 100644 PishkhanHelper/src/main/res/values/properties.xml

diff --git a/PishkhanHelper/build.gradle b/PishkhanHelper/build.gradle
index 501d918..7145690 100644
--- a/PishkhanHelper/build.gradle
+++ b/PishkhanHelper/build.gradle
@@ -53,13 +53,13 @@ dependencies {
     implementation 'com.github.shadowalker77:whygoogle:0.8.2'
 
     //Ayan Networking
-    implementation 'com.github.shadowalker77:networking:1.6.1'
+    implementation 'com.github.shadowalker77:networking:1.6.7'
 
     //Version Control
     implementation 'com.github.ayantech:versioncontrol:0.6.2'
 
     //Push Notification
-    implementation 'com.github.shadowalker77:pushnotification:1.1.10'
+    implementation 'com.github.shadowalker77:pushnotification:1.1.11'
 
     //Scanner
     api 'com.google.zxing:core:3.5.0'
@@ -94,7 +94,7 @@ afterEvaluate {
                 artifactId = 'pishkhanhelper'
 
                 // Version Library Name (Example : "1.0.0")
-                version = '0.3.2'
+                version = '0.3.4'
             }
         }
     }
diff --git a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/activity/HelperDrawerActivity.kt b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/activity/HelperDrawerActivity.kt
index 341c20d..e39b286 100644
--- a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/activity/HelperDrawerActivity.kt
+++ b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/activity/HelperDrawerActivity.kt
@@ -11,6 +11,7 @@ import ir.ayantech.ayannetworking.api.AyanApi
 import ir.ayantech.ayannetworking.api.AyanCommonCallStatus
 import ir.ayantech.ayannetworking.api.CallingState
 import ir.ayantech.ayannetworking.ayanModel.FailureType
+import ir.ayantech.pishkhanhelper.model.versionControl.AppExtraInfo
 import ir.ayantech.pishkhanhelper.PishkhanHelper
 import ir.ayantech.pishkhanhelper.R
 import ir.ayantech.pishkhanhelper.app.HelperApplication
@@ -25,6 +26,7 @@ import ir.ayantech.pishkhanhelper.model.AppInfo
 import ir.ayantech.pishkhanhelper.rate.showRatingIntent
 import ir.ayantech.pishkhanhelper.storage.SavedData
 import ir.ayantech.pishkhanhelper.fragment.login.EnterPhoneNumberFragment
+import ir.ayantech.pushsdk.core.AyanNotification
 import ir.ayantech.versioncontrol.VersionControlCore
 import ir.ayantech.whygoogle.fragment.WhyGoogleFragment
 import ir.ayantech.whygoogle.helper.SimpleCallBack
@@ -119,6 +121,7 @@ abstract class HelperDrawerActivity : LocaleHelperActivity<HelperDrawerActivityB
     abstract val handleToolbarRlVisibilityOnTopFragmentChanged: (whyGoogleFragment: WhyGoogleFragment<*>) -> Boolean
     abstract val handleDrawerLayoutLockOnTopFragmentChanged: (whyGoogleFragment: WhyGoogleFragment<*>) -> Boolean
     abstract val getUserPhoneNumber: () -> String
+    abstract val getUserToken: () -> String
 
     open val onPrivacyPolicyMenuItemClicked: SimpleCallBack? = null
     open val onTermsAndConditionsMenuItemClicked: SimpleCallBack? = null
@@ -138,6 +141,18 @@ abstract class HelperDrawerActivity : LocaleHelperActivity<HelperDrawerActivityB
         handleIntent(intent)
     }
 
+    private fun reportTokenForNotif() {
+        AyanNotification.reportExtraInfo(AppExtraInfo(getUserToken()))
+    }
+
+    private fun checkForNewVersion() {
+        VersionControlCore.getInstance()
+            .setApplicationName(appInfo.applicationName)
+            .setCategoryName(appInfo.flavor)
+            .setExtraInfo(AppExtraInfo(getUserToken()))
+            .checkForNewVersion(this)
+    }
+
     private fun initViews() {
         initNavigationDrawer()
         initToolbar()
@@ -169,6 +184,8 @@ abstract class HelperDrawerActivity : LocaleHelperActivity<HelperDrawerActivityB
         } else {
             initialize {
                 initViews()
+                checkForNewVersion()
+                reportTokenForNotif()
             }
         }
 
@@ -311,8 +328,8 @@ abstract class HelperDrawerActivity : LocaleHelperActivity<HelperDrawerActivityB
 
     private fun onMenuItemClicked(callback: SimpleCallBack) {
         hideKeyboard()
-        callback()
         closeDrawer()
+        callback()
     }
 
     private fun closeDrawer() {
diff --git a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/app/HelperApplication.kt b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/app/HelperApplication.kt
index 8e4aaa2..157fe3e 100644
--- a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/app/HelperApplication.kt
+++ b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/app/HelperApplication.kt
@@ -28,7 +28,7 @@ abstract class HelperApplication : LocaleHelperApplication() {
         corePishkhan24AyanApi = AyanApi(
             context = this,
             getUserToken = this.getUserToken,
-            defaultBaseUrl = "https://core.pishkhan24.ayantech.ir/webservices/Core.svc/",
+            defaultBaseUrl = appInfo.coreApiBaseUrl ?: "https://core.pishkhan24.ayantech.ir/webservices/Core.svc/",
             timeout = 120,
             headers = hashMapOf("Accept-Language" to "fa"),
             logLevel = if (appInfo.isDebugMode) LogLevel.LOG_ALL else LogLevel.DO_NOT_LOG
@@ -37,7 +37,7 @@ abstract class HelperApplication : LocaleHelperApplication() {
         servicesPishkhan24AyanApi = AyanApi(
             context = this,
             getUserToken = this.getUserToken,
-            defaultBaseUrl = "https://services.pishkhan24.ayantech.ir/webservices/services.svc/",
+            defaultBaseUrl = appInfo.servicesApiBaseUrl ?: "https://services.pishkhan24.ayantech.ir/webservices/services.svc/",
             timeout = 120,
             headers = hashMapOf("Accept-Language" to "fa"),
             logLevel = if (appInfo.isDebugMode) LogLevel.LOG_ALL else LogLevel.DO_NOT_LOG
diff --git a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/fragment/login/EnterOtpCodeFragment.kt b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/fragment/login/EnterOtpCodeFragment.kt
index 93e2373..3108245 100644
--- a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/fragment/login/EnterOtpCodeFragment.kt
+++ b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/fragment/login/EnterOtpCodeFragment.kt
@@ -14,7 +14,9 @@ import ir.ayantech.pishkhanhelper.helper.changeEnable
 import ir.ayantech.pishkhanhelper.helper.getColorCompat
 import ir.ayantech.pishkhanhelper.helper.setSpanText
 import ir.ayantech.pishkhanhelper.helper.startTimer
+import ir.ayantech.pushsdk.core.AyanNotification
 import ir.ayantech.whygoogle.fragment.WhyGoogleFragment
+import ir.ayantech.whygoogle.helper.SimpleCallBack
 
 abstract class EnterOtpCodeFragment : WhyGoogleFragment<FragmentEnterOtpCodeBinding>() {
 
@@ -30,7 +32,9 @@ abstract class EnterOtpCodeFragment : WhyGoogleFragment<FragmentEnterOtpCodeBind
     abstract val appIcon: Int
 
     abstract fun resendOtpCode()
+    @Deprecated(message = "Use function with two parameters: login(otpCode, reportPhoneNumber)")
     abstract fun login(otpCode: String)
+    abstract fun login(otpCode: String, reportPhoneNumber: SimpleCallBack)
 
     override fun onCreate() {
         super.onCreate()
@@ -75,10 +79,14 @@ abstract class EnterOtpCodeFragment : WhyGoogleFragment<FragmentEnterOtpCodeBind
         if (otpCode.isEmpty() || otpCode.length < 4) {
             binding.otpCodeInput.setInputComponentError(getString(R.string.enter_otp_code))
         } else {
-            login(otpCode = otpCode)
+            login(otpCode = otpCode, reportPhoneNumber = reportPhoneNumberForNotif)
         }
     }
 
+    open val reportPhoneNumberForNotif: SimpleCallBack = {
+        phoneNumber?.let { AyanNotification.reportDeviceMobileNumber(it) }
+    }
+
     private var timer: CountDownTimer? = null
 
     private fun startRemainingSecondsTimer() {
diff --git a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/AppInfo.kt b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/AppInfo.kt
index 829788f..102c0b4 100644
--- a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/AppInfo.kt
+++ b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/AppInfo.kt
@@ -10,5 +10,7 @@ data class AppInfo(
     val flavor: String,
     val applicationId: String,
     val isDebugMode: Boolean,
-    @DrawableRes val appIcon: Int
+    @DrawableRes val appIcon: Int,
+    val coreApiBaseUrl: String? = null,
+    val servicesApiBaseUrl: String? = null
 )
diff --git a/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/versionControl/AppExtraInfo.kt b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/versionControl/AppExtraInfo.kt
new file mode 100644
index 0000000..be01d0c
--- /dev/null
+++ b/PishkhanHelper/src/main/java/ir/ayantech/pishkhanhelper/model/versionControl/AppExtraInfo.kt
@@ -0,0 +1,7 @@
+package ir.ayantech.pishkhanhelper.model.versionControl
+
+import ir.ayantech.versioncontrol.model.ExtraInfoModel
+
+data class AppExtraInfo(val Token: String) : ExtraInfoModel()
+
+data class AppPushExtraInfo(val Token: String)
\ No newline at end of file
diff --git a/PishkhanHelper/src/main/res/drawable/ic_privacy_policy.xml b/PishkhanHelper/src/main/res/drawable/helper_ic_privacy_policy.xml
similarity index 100%
rename from PishkhanHelper/src/main/res/drawable/ic_privacy_policy.xml
rename to PishkhanHelper/src/main/res/drawable/helper_ic_privacy_policy.xml
diff --git a/PishkhanHelper/src/main/res/drawable/ic_terms_and_conditions.xml b/PishkhanHelper/src/main/res/drawable/helper_ic_terms_and_conditions.xml
similarity index 100%
rename from PishkhanHelper/src/main/res/drawable/ic_terms_and_conditions.xml
rename to PishkhanHelper/src/main/res/drawable/helper_ic_terms_and_conditions.xml
diff --git a/PishkhanHelper/src/main/res/drawable/notif_logo.png b/PishkhanHelper/src/main/res/drawable/notif_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fc9e864b20a3cb26e17bccf4ceede40cdceb29f
GIT binary patch
literal 9010
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

literal 0
HcmV?d00001

diff --git a/PishkhanHelper/src/main/res/layout/helper_drawer_activity.xml b/PishkhanHelper/src/main/res/layout/helper_drawer_activity.xml
index 01ad055..71eec9c 100644
--- a/PishkhanHelper/src/main/res/layout/helper_drawer_activity.xml
+++ b/PishkhanHelper/src/main/res/layout/helper_drawer_activity.xml
@@ -240,7 +240,7 @@
                     android:layout_centerVertical="true"
                     android:background="@drawable/helper_background_radius_8"
                     android:padding="@dimen/margin_8"
-                    app:srcCompat="@drawable/ic_privacy_policy" />
+                    app:srcCompat="@drawable/helper_ic_privacy_policy" />
             </RelativeLayout>
 
             <RelativeLayout
@@ -276,14 +276,14 @@
                     android:layout_centerVertical="true"
                     android:background="@drawable/helper_background_radius_8"
                     android:padding="@dimen/margin_8"
-                    app:srcCompat="@drawable/ic_terms_and_conditions" />
+                    app:srcCompat="@drawable/helper_ic_terms_and_conditions" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/appLanguageRl"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/margin_48"
-                android:layout_below="@id/shareAppRl"
+                android:layout_below="@id/termsAndConditionsRl"
                 android:layout_centerHorizontal="true"
                 android:layout_marginStart="@dimen/margin_16"
                 android:layout_marginTop="@dimen/margin_8"
diff --git a/PishkhanHelper/src/main/res/values/properties.xml b/PishkhanHelper/src/main/res/values/properties.xml
new file mode 100644
index 0000000..4cf58cb
--- /dev/null
+++ b/PishkhanHelper/src/main/res/values/properties.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="applicationName">Hook</string>
+    <string name="applicationType">android</string>
+    <drawable name="pushIcon">@drawable/notif_logo</drawable>
+</resources>
\ No newline at end of file