From e5ce6532f5bfdf3d8589009c5f28a8e1c167dfc4 Mon Sep 17 00:00:00 2001 From: Peter Pesti-Varga Date: Mon, 17 Mar 2025 13:13:05 +0100 Subject: [PATCH] fix: Fix Android build setting (#4967) --- packages/android/app/build.gradle.kts | 2 +- .../android/app/src/main/AndroidManifest.xml | 1 - .../main/res/mipmap-anydpi/ic_launcher.xml | 6 ----- .../res/mipmap-anydpi/ic_launcher_round.xml | 6 ----- .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 0 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 0 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 0 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 0 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 0 bytes .../android/formbricksSDK/build.gradle.kts | 22 ++++++++++++--- .../android/formbricksSDK/consumer-rules.pro | 2 ++ .../formbricks/formbrickssdk/Formbricks.kt | 23 +++++++--------- .../extensions/DateExtensions.kt | 21 +++++++-------- .../formbricks/formbrickssdk/logger/Logger.kt | 24 +++++++++++++++++ .../formbrickssdk/manager/SurveyManager.kt | 25 +++++++++--------- .../formbrickssdk/manager/UserManager.kt | 4 +-- .../network/queue/UpdateQueue.kt | 6 ++--- .../webview/FormbricksFragment.kt | 12 +++------ .../formbrickssdk/webview/WebAppInterface.kt | 12 ++++----- packages/android/gradle/libs.versions.toml | 3 --- 20 files changed, 91 insertions(+), 78 deletions(-) delete mode 100644 packages/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml delete mode 100644 packages/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml delete mode 100644 packages/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp delete mode 100644 packages/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp delete mode 100644 packages/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp delete mode 100644 packages/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp delete mode 100644 packages/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/logger/Logger.kt diff --git a/packages/android/app/build.gradle.kts b/packages/android/app/build.gradle.kts index d2bf794cfa..8ea81d2ebb 100644 --- a/packages/android/app/build.gradle.kts +++ b/packages/android/app/build.gradle.kts @@ -11,7 +11,7 @@ android { defaultConfig { applicationId = "com.formbricks.demo" - minSdk = 26 + minSdk = 24 targetSdk = 35 versionCode = 1 versionName = "1.0" diff --git a/packages/android/app/src/main/AndroidManifest.xml b/packages/android/app/src/main/AndroidManifest.xml index d0460a8f9c..e57bab9e9d 100644 --- a/packages/android/app/src/main/AndroidManifest.xml +++ b/packages/android/app/src/main/AndroidManifest.xml @@ -9,7 +9,6 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:networkSecurityConfig="@xml/network_security_config" - android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.Demo" tools:targetApi="31"> diff --git a/packages/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/packages/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml deleted file mode 100644 index 6f3b755bf5..0000000000 --- a/packages/android/app/src/main/res/mipmap-anydpi/ic_launcher.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packages/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml b/packages/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml deleted file mode 100644 index 6f3b755bf5..0000000000 --- a/packages/android/app/src/main/res/mipmap-anydpi/ic_launcher_round.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/packages/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/packages/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2898 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 diff --git a/packages/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/packages/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da081676d42f6c3f78a2c91e7bcedddedb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1772 zcmVQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/packages/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/packages/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/packages/android/formbricksSDK/build.gradle.kts b/packages/android/formbricksSDK/build.gradle.kts index f304ab3d8f..307bed78ff 100644 --- a/packages/android/formbricksSDK/build.gradle.kts +++ b/packages/android/formbricksSDK/build.gradle.kts @@ -12,7 +12,7 @@ android { compileSdk = 35 defaultConfig { - minSdk = 26 + minSdk = 24 testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles("consumer-rules.pro") @@ -30,6 +30,24 @@ android { ) } } + + packaging { + resources { + excludes += "META-INF/library_release.kotlin_module" + excludes += "classes.dex" + excludes += "**.**" + pickFirsts += "**/DataBinderMapperImpl.java" + pickFirsts += "**/DataBinderMapperImpl.class" + pickFirsts += "**/formbrickssdk/DataBinderMapperImpl.java" + pickFirsts += "**/formbrickssdk/DataBinderMapperImpl.class" + } + } + viewBinding { + enable = true + } + dataBinding { + enable = true + } buildFeatures { dataBinding = true viewBinding = true @@ -65,8 +83,6 @@ dependencies { implementation(libs.material) - implementation(libs.timber) - implementation(libs.kotlinx.serialization.json) implementation(libs.androidx.legacy.support.v4) implementation(libs.androidx.lifecycle.livedata.ktx) diff --git a/packages/android/formbricksSDK/consumer-rules.pro b/packages/android/formbricksSDK/consumer-rules.pro index e69de29bb2..d1518d7c57 100644 --- a/packages/android/formbricksSDK/consumer-rules.pro +++ b/packages/android/formbricksSDK/consumer-rules.pro @@ -0,0 +1,2 @@ +-keep class com.formbricks.formbrickssdk.DataBinderMapperImpl { *; } +-keep class com.formbricks.formbrickssdk.Formbricks { *; } \ No newline at end of file diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/Formbricks.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/Formbricks.kt index 35f35d7d9f..e8d6a6d5f6 100644 --- a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/Formbricks.kt +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/Formbricks.kt @@ -7,12 +7,11 @@ import androidx.annotation.Keep import androidx.fragment.app.FragmentManager import com.formbricks.formbrickssdk.api.FormbricksApi import com.formbricks.formbrickssdk.helper.FormbricksConfig +import com.formbricks.formbrickssdk.logger.Logger import com.formbricks.formbrickssdk.manager.SurveyManager import com.formbricks.formbrickssdk.manager.UserManager import com.formbricks.formbrickssdk.model.error.SDKError import com.formbricks.formbrickssdk.webview.FormbricksFragment -import timber.log.Timber - @Keep object Formbricks { @@ -61,10 +60,6 @@ object Formbricks { SurveyManager.refreshEnvironmentIfNeeded() UserManager.syncUserStateIfNeeded() - if (loggingEnabled) { - Timber.plant(Timber.DebugTree()) - } - isInitialized = true } @@ -79,7 +74,7 @@ object Formbricks { */ fun setUserId(userId: String) { if (!isInitialized) { - Timber.e(SDKError.sdkIsNotInitialized) + Logger.e(exception = SDKError.sdkIsNotInitialized) return } UserManager.set(userId) @@ -96,7 +91,7 @@ object Formbricks { */ fun setAttribute(attribute: String, key: String) { if (!isInitialized) { - Timber.e(SDKError.sdkIsNotInitialized) + Logger.e(exception = SDKError.sdkIsNotInitialized) return } UserManager.addAttribute(attribute, key) @@ -113,7 +108,7 @@ object Formbricks { */ fun setAttributes(attributes: Map) { if (!isInitialized) { - Timber.e(SDKError.sdkIsNotInitialized) + Logger.e(exception = SDKError.sdkIsNotInitialized) return } UserManager.setAttributes(attributes) @@ -130,7 +125,7 @@ object Formbricks { */ fun setLanguage(language: String) { if (!isInitialized) { - Timber.e(SDKError.sdkIsNotInitialized) + Logger.e(exception = SDKError.sdkIsNotInitialized) return } Formbricks.language = language @@ -148,12 +143,12 @@ object Formbricks { */ fun track(action: String) { if (!isInitialized) { - Timber.e(SDKError.sdkIsNotInitialized) + Logger.e(exception = SDKError.sdkIsNotInitialized) return } if (!isInternetAvailable()) { - Timber.w(SDKError.connectionIsNotAvailable) + Logger.w(exception = SDKError.connectionIsNotAvailable) return } @@ -171,7 +166,7 @@ object Formbricks { */ fun logout() { if (!isInitialized) { - Timber.e(SDKError.sdkIsNotInitialized) + Logger.e(exception = SDKError.sdkIsNotInitialized) return } @@ -195,7 +190,7 @@ object Formbricks { /// Assembles the survey fragment and presents it internal fun showSurvey(id: String) { if (fragmentManager == null) { - Timber.e(SDKError.fragmentManagerIsNotSet) + Logger.e(exception = SDKError.fragmentManagerIsNotSet) return } diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/extensions/DateExtensions.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/extensions/DateExtensions.kt index 296c826026..eb78ed22e7 100644 --- a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/extensions/DateExtensions.kt +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/extensions/DateExtensions.kt @@ -4,9 +4,6 @@ import com.formbricks.formbrickssdk.model.environment.EnvironmentDataHolder import com.formbricks.formbrickssdk.model.user.UserState import com.formbricks.formbrickssdk.model.user.UserStateData import java.text.SimpleDateFormat -import java.time.LocalDateTime -import java.time.ZoneId -import java.time.format.DateTimeFormatter import java.util.Date import java.util.Locale import java.util.TimeZone @@ -22,9 +19,9 @@ fun Date.dateString(): String { fun UserStateData.lastDisplayAt(): Date? { lastDisplayAt?.let { try { - val formatter = DateTimeFormatter.ofPattern(dateFormatPattern) - val dateTime = LocalDateTime.parse(it, formatter) - return Date.from(dateTime.atZone(ZoneId.of("GMT")).toInstant()) + val formatter = SimpleDateFormat(dateFormatPattern, Locale.getDefault()) + formatter.timeZone = TimeZone.getTimeZone("UTC") + return formatter.parse(it) } catch (e: Exception) { return null } @@ -36,9 +33,9 @@ fun UserStateData.lastDisplayAt(): Date? { fun UserState.expiresAt(): Date? { expiresAt?.let { try { - val formatter = DateTimeFormatter.ofPattern(dateFormatPattern) - val dateTime = LocalDateTime.parse(it, formatter) - return Date.from(dateTime.atZone(ZoneId.of("GMT")).toInstant()) + val formatter = SimpleDateFormat(dateFormatPattern, Locale.getDefault()) + formatter.timeZone = TimeZone.getTimeZone("UTC") + return formatter.parse(it) } catch (e: Exception) { return null } @@ -50,9 +47,9 @@ fun UserState.expiresAt(): Date? { fun EnvironmentDataHolder.expiresAt(): Date? { data?.expiresAt?.let { try { - val formatter = DateTimeFormatter.ofPattern(dateFormatPattern) - val dateTime = LocalDateTime.parse(it, formatter) - return Date.from(dateTime.atZone(ZoneId.of("GMT")).toInstant()) + val formatter = SimpleDateFormat(dateFormatPattern, Locale.getDefault()) + formatter.timeZone = TimeZone.getTimeZone("UTC") + return formatter.parse(it) } catch (e: Exception) { return null } diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/logger/Logger.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/logger/Logger.kt new file mode 100644 index 0000000000..ea45dd6484 --- /dev/null +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/logger/Logger.kt @@ -0,0 +1,24 @@ +package com.formbricks.formbrickssdk.logger + +import android.util.Log +import com.formbricks.formbrickssdk.Formbricks + +object Logger { + fun d(message: String) { + if (Formbricks.loggingEnabled) { + Log.d("FormbricksSDK", message) + } + } + + fun e(message: String? = "Exception", exception: RuntimeException? = null) { + if (Formbricks.loggingEnabled) { + Log.e("FormbricksSDK", message, exception) + } + } + + fun w(message: String? = "Warning", exception: RuntimeException? = null) { + if (Formbricks.loggingEnabled) { + Log.w("FormbricksSDK", message, exception) + } + } +} \ No newline at end of file diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/SurveyManager.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/SurveyManager.kt index 9f7c30c92a..cc0a373ede 100644 --- a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/SurveyManager.kt +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/SurveyManager.kt @@ -5,6 +5,7 @@ import com.formbricks.formbrickssdk.Formbricks import com.formbricks.formbrickssdk.api.FormbricksApi import com.formbricks.formbrickssdk.extensions.expiresAt import com.formbricks.formbrickssdk.extensions.guard +import com.formbricks.formbrickssdk.logger.Logger import com.formbricks.formbrickssdk.model.environment.EnvironmentDataHolder import com.formbricks.formbrickssdk.model.environment.Survey import com.formbricks.formbrickssdk.model.user.Display @@ -12,12 +13,10 @@ import com.google.gson.Gson import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import timber.log.Timber -import java.time.Instant -import java.time.temporal.ChronoUnit import java.util.Date import java.util.Timer import java.util.TimerTask +import java.util.concurrent.TimeUnit /** * The SurveyManager is responsible for managing the surveys that are displayed to the user. @@ -58,7 +57,7 @@ object SurveyManager { try { Gson().fromJson(json, EnvironmentDataHolder::class.java) } catch (e: Exception) { - Timber.tag("SurveyManager").e("Unable to retrieve environment data from the local storage.") + Logger.e("Unable to retrieve environment data from the local storage.") null } } @@ -102,7 +101,7 @@ object SurveyManager { if (!force) { environmentDataHolder?.expiresAt()?.let { if (it.after(Date())) { - Timber.tag("SurveyManager").d("Environment state is still valid until $it") + Logger.d("Environment state is still valid until $it") filterSurveys() return } @@ -117,7 +116,7 @@ object SurveyManager { hasApiError = false } catch (e: Exception) { hasApiError = true - Timber.tag("SurveyManager").e(e, "Unable to refresh environment state.") + Logger.e("Unable to refresh environment state.") startErrorTimer() } } @@ -148,7 +147,7 @@ object SurveyManager { Formbricks.showSurvey(it) } - }, Date.from(Instant.now().plusSeconds(timeout.toLong()))) + }, Date(System.currentTimeMillis() + timeout.toLong() * 1000)) } } } @@ -167,7 +166,7 @@ object SurveyManager { */ fun postResponse(surveyId: String?) { val id = surveyId.guard { - Timber.tag("SurveyManager").e("Survey id is mandatory to set.") + Logger.e("Survey id is mandatory to set.") return } @@ -179,7 +178,7 @@ object SurveyManager { */ fun onNewDisplay(surveyId: String?) { val id = surveyId.guard { - Timber.tag("SurveyManager").e("Survey id is mandatory to set.") + Logger.e("Survey id is mandatory to set.") return } @@ -193,7 +192,7 @@ object SurveyManager { val date = expiresAt.guard { return } refreshTimer.schedule(object: TimerTask() { override fun run() { - Timber.tag("SurveyManager").d("Refreshing environment state.") + Logger.d("Refreshing environment state.") refreshEnvironmentIfNeeded() } @@ -207,7 +206,7 @@ object SurveyManager { val targetDate = Date(System.currentTimeMillis() + 1000 * 60 * REFRESH_STATE_ON_ERROR_TIMEOUT_IN_MINUTES) refreshTimer.schedule(object: TimerTask() { override fun run() { - Timber.tag("SurveyManager").d("Refreshing environment state after an error") + Logger.d("Refreshing environment state after an error") refreshEnvironmentIfNeeded() } @@ -240,7 +239,7 @@ object SurveyManager { } else -> { - Timber.tag("SurveyManager").e("Invalid Display Option") + Logger.e("Invalid Display Option") false } } @@ -257,7 +256,7 @@ object SurveyManager { val recontactDays = survey.recontactDays ?: defaultRecontactDays if (recontactDays != null) { - val daysBetween = ChronoUnit.DAYS.between(lastDisplayedAt.toInstant(), Instant.now()) + val daysBetween = TimeUnit.MILLISECONDS.toDays(Date().time - lastDisplayedAt.time) return@filter daysBetween >= recontactDays.toInt() } diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/UserManager.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/UserManager.kt index c3159c444a..7fcb3eb625 100644 --- a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/UserManager.kt +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/manager/UserManager.kt @@ -7,13 +7,13 @@ import com.formbricks.formbrickssdk.extensions.dateString import com.formbricks.formbrickssdk.extensions.expiresAt import com.formbricks.formbrickssdk.extensions.guard import com.formbricks.formbrickssdk.extensions.lastDisplayAt +import com.formbricks.formbrickssdk.logger.Logger import com.formbricks.formbrickssdk.model.user.Display import com.formbricks.formbrickssdk.network.queue.UpdateQueue import com.google.gson.Gson import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import timber.log.Timber import java.util.Date import java.util.Timer import java.util.TimerTask @@ -140,7 +140,7 @@ object UserManager { SurveyManager.filterSurveys() startSyncTimer() } catch (e: Exception) { - Timber.tag("SurveyManager").e(e, "Unable to post survey response.") + Logger.e("Unable to post survey response.") } } } diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/network/queue/UpdateQueue.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/network/queue/UpdateQueue.kt index b765cc00bd..8c6a067b17 100644 --- a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/network/queue/UpdateQueue.kt +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/network/queue/UpdateQueue.kt @@ -1,7 +1,7 @@ package com.formbricks.formbrickssdk.network.queue +import com.formbricks.formbrickssdk.logger.Logger import com.formbricks.formbrickssdk.manager.UserManager -import timber.log.Timber import java.util.* import kotlin.concurrent.timer @@ -57,11 +57,11 @@ class UpdateQueue private constructor() { private fun commit() { val currentUserId = userId if (currentUserId == null) { - Timber.d("Error: User ID is not set yet") + Logger.d("Error: User ID is not set yet") return } - Timber.d("UpdateQueue - commit() called on UpdateQueue with $currentUserId and $attributes") + Logger.d("UpdateQueue - commit() called on UpdateQueue with $currentUserId and $attributes") UserManager.syncUser(currentUserId, attributes) } diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/FormbricksFragment.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/FormbricksFragment.kt index 847f3bc81f..33905d103f 100644 --- a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/FormbricksFragment.kt +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/FormbricksFragment.kt @@ -6,14 +6,12 @@ import android.app.Dialog import android.content.Intent import android.graphics.Color import android.net.Uri -import android.os.Build import android.os.Bundle import android.provider.OpenableColumns import android.util.Base64 import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.view.WindowInsets import android.view.WindowManager import android.webkit.ConsoleMessage import android.webkit.WebChromeClient @@ -25,16 +23,14 @@ import androidx.fragment.app.viewModels import com.formbricks.formbrickssdk.Formbricks import com.formbricks.formbrickssdk.R import com.formbricks.formbrickssdk.databinding.FragmentFormbricksBinding +import com.formbricks.formbrickssdk.logger.Logger import com.formbricks.formbrickssdk.manager.SurveyManager import com.formbricks.formbrickssdk.model.javascript.FileUploadData import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialogFragment import com.google.gson.JsonObject -import kotlinx.serialization.json.JsonArray -import timber.log.Timber import java.io.ByteArrayOutputStream import java.io.InputStream -import java.time.Instant import java.util.Date import java.util.Timer import java.util.TimerTask @@ -58,7 +54,8 @@ class FormbricksFragment : BottomSheetDialogFragment() { dismiss() } - }, Date.from(Instant.now().plusSeconds(CLOSING_TIMEOUT_IN_SECONDS))) + }, Date(System.currentTimeMillis() + CLOSING_TIMEOUT_IN_SECONDS * 1000) + ) } override fun onDisplayCreated() { @@ -158,7 +155,7 @@ class FormbricksFragment : BottomSheetDialogFragment() { override fun onConsoleMessage(consoleMessage: ConsoleMessage?): Boolean { consoleMessage?.let { cm -> val log = "[CONSOLE:${cm.messageLevel()}] \"${cm.message()}\", source: ${cm.sourceId()} (${cm.lineNumber()})" - Timber.tag("Javascript message").d(log) + Logger.d(log) } return super.onConsoleMessage(consoleMessage) } @@ -229,4 +226,3 @@ class FormbricksFragment : BottomSheetDialogFragment() { private const val CLOSING_TIMEOUT_IN_SECONDS = 5L } } - diff --git a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/WebAppInterface.kt b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/WebAppInterface.kt index 8618c7bc53..c2cc9925a4 100644 --- a/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/WebAppInterface.kt +++ b/packages/android/formbricksSDK/src/main/java/com/formbricks/formbrickssdk/webview/WebAppInterface.kt @@ -1,11 +1,11 @@ package com.formbricks.formbrickssdk.webview import android.webkit.JavascriptInterface +import com.formbricks.formbrickssdk.logger.Logger import com.formbricks.formbrickssdk.model.javascript.JsMessageData import com.formbricks.formbrickssdk.model.javascript.EventType import com.formbricks.formbrickssdk.model.javascript.FileUploadData import com.google.gson.JsonParseException -import timber.log.Timber class WebAppInterface(private val callback: WebAppCallback?) { @@ -22,7 +22,7 @@ class WebAppInterface(private val callback: WebAppCallback?) { */ @JavascriptInterface fun message(data: String) { - Timber.tag("WebAppInterface message").d(data) + Logger.d(data) try { val jsMessage = JsMessageData.from(data) @@ -34,13 +34,13 @@ class WebAppInterface(private val callback: WebAppCallback?) { EventType.ON_FILE_PICK -> { callback?.onFilePick(FileUploadData.from(data)) } } } catch (e: Exception) { - Timber.tag("WebAppInterface error").e(e) + Logger.e(e.message) } catch (e: JsonParseException) { - Timber.tag("WebAppInterface error").e(e, "Failed to parse JSON message: $data") + Logger.e("Failed to parse JSON message: $data") } catch (e: IllegalArgumentException) { - Timber.tag("WebAppInterface error").e(e, "Invalid message format: $data") + Logger.e("Invalid message format: $data") } catch (e: Exception) { - Timber.tag("WebAppInterface error").e(e, "Unexpected error processing message: $data") + Logger.e("Unexpected error processing message: $data") } } diff --git a/packages/android/gradle/libs.versions.toml b/packages/android/gradle/libs.versions.toml index ef49a3c8d3..d5baec625b 100644 --- a/packages/android/gradle/libs.versions.toml +++ b/packages/android/gradle/libs.versions.toml @@ -27,8 +27,6 @@ lifecycleViewmodelKtx = "2.8.7" fragmentKtx = "1.8.5" databindingCommon = "8.8.0" -timber = "5.0.1" - [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } junit = { group = "junit", name = "junit", version.ref = "junit" } @@ -53,7 +51,6 @@ retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", ve retrofit-converter-scalars = { module = "com.squareup.retrofit2:converter-scalars", version.ref = "retrofit" } okhttp3-logging-interceptor = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp3" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } -timber = { module = "com.jakewharton.timber:timber", version.ref = "timber" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } androidx-legacy-support-v4 = { group = "androidx.legacy", name = "legacy-support-v4", version.ref = "legacySupportV4" }