Skip to content

Commit d2360a6

Browse files
beigiradbeigirad
committed
update firebase messaging and analytics
before adding app-metrica
1 parent 8b6f6ee commit d2360a6

File tree

5 files changed

+111
-102
lines changed

5 files changed

+111
-102
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ dependencies {
118118
implementation "com.github.skydoves:landscapist-glide:1.4.0"
119119

120120
// firebase
121-
implementation 'com.google.firebase:firebase-messaging:20.2.0'
122-
implementation 'com.google.firebase:firebase-analytics:17.4.2'
121+
implementation 'com.google.firebase:firebase-messaging-ktx:23.0.0'
122+
implementation 'com.google.firebase:firebase-analytics-ktx:20.0.2'
123123

124124
def kotpref_version = "2.13.2"
125125
implementation "com.chibatching.kotpref:kotpref:$kotpref_version"

‎app/src/main/java/ir/kindnesswall/BaseActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import androidx.appcompat.app.AlertDialog
1414
import androidx.appcompat.app.AppCompatActivity
1515
import androidx.appcompat.widget.AppCompatTextView
1616
import androidx.core.content.ContextCompat
17-
import com.google.firebase.iid.FirebaseInstanceId
17+
import com.google.firebase.messaging.FirebaseMessaging
1818
import ir.kindnesswall.data.local.AppPref
1919
import ir.kindnesswall.data.local.UserInfoPref
2020
import ir.kindnesswall.data.repository.UserRepo
@@ -64,9 +64,9 @@ abstract class BaseActivity : AppCompatActivity() {
6464

6565
if (UserInfoPref.bearerToken.isNotEmpty()) {
6666
if (UserInfoPref.fireBaseToken.isEmpty()) {
67-
FirebaseInstanceId.getInstance().instanceId.addOnCompleteListener { result ->
67+
FirebaseMessaging.getInstance().token.addOnCompleteListener { result ->
6868
if (result.isSuccessful) {
69-
val token = result.result?.token.toString()
69+
val token = result.result.toString()
7070
if (token.isNotEmpty()) {
7171
UserInfoPref.fireBaseToken = token
7272
userRepo.registerFirebaseToken()

‎app/src/main/java/ir/kindnesswall/view/authentication/InsertVerificationNumberFragment.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import android.view.View
99
import android.view.ViewGroup
1010
import androidx.core.widget.doOnTextChanged
1111
import androidx.databinding.DataBindingUtil
12-
import com.google.firebase.iid.FirebaseInstanceId
12+
import com.google.firebase.messaging.FirebaseMessaging
1313
import ir.kindnesswall.BaseFragment
1414
import ir.kindnesswall.R
1515
import ir.kindnesswall.data.local.AppPref
@@ -157,9 +157,9 @@ class InsertVerificationNumberFragment : BaseFragment() {
157157
when (it.status) {
158158
CustomResult.Status.SUCCESS -> {
159159
dismissProgressDialog()
160-
FirebaseInstanceId.getInstance().instanceId.addOnCompleteListener { result ->
160+
FirebaseMessaging.getInstance().token.addOnCompleteListener { result ->
161161
if (result.isSuccessful) {
162-
val token = result.result?.token.toString()
162+
val token = result.result.toString()
163163
if (token.isNotEmpty()) {
164164
UserInfoPref.fireBaseToken = token
165165
AppPref.shouldUpdatedFireBaseToken = true

‎scripts/extract_dependencies/kapt.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,5 +109,5 @@ You can use '--warning-mode all' to show the individual deprecation warnings and
109109

110110
See https://docs.gradle.org/7.2/userguide/command_line_interface.html#sec:command_line_warnings
111111

112-
BUILD SUCCESSFUL in 4s
112+
BUILD SUCCESSFUL in 2s
113113
1 actionable task: 1 executed

‎scripts/extract_dependencies/stagingDebugRuntimeClasspath.txt‎

Lines changed: 102 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -419,105 +419,114 @@ stagingDebugRuntimeClasspath - Runtime classpath of compilation 'stagingDebug' (
419419
| +--- androidx.compose.ui:ui:1.0.4 -> 1.0.5 (*)
420420
| +--- androidx.compose.runtime:runtime:1.0.4 -> 1.0.5 (*)
421421
| \--- androidx.compose.foundation:foundation:1.0.4 -> 1.0.5 (*)
422-
+--- com.google.firebase:firebase-messaging:20.2.0
423-
| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
424-
| +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
425-
| +--- com.google.android.datatransport:transport-api:2.2.0
426-
| +--- com.google.android.datatransport:transport-backend-cct:2.2.0
427-
| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
428-
| | +--- com.google.android.datatransport:transport-api:2.2.0
429-
| | +--- com.google.android.datatransport:transport-runtime:2.2.0
430-
| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
431-
| | | +--- com.google.android.datatransport:transport-api:2.2.0
432-
| | | \--- com.google.dagger:dagger:2.24
433-
| | | \--- javax.inject:javax.inject:1
434-
| | \--- com.google.firebase:firebase-encoders-json:16.0.0
435-
| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
436-
| +--- com.google.android.datatransport:transport-runtime:2.2.0 (*)
437-
| +--- com.google.android.gms:play-services-basement:17.0.0
422+
+--- com.google.firebase:firebase-messaging-ktx:23.0.0
423+
| +--- com.google.android.gms:play-services-basement:17.2.1 -> 18.0.0
438424
| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
439-
| | +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
425+
| | +--- androidx.core:core:1.2.0 -> 1.5.0 (*)
440426
| | \--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*)
441-
| +--- com.google.android.gms:play-services-stats:17.0.0
442-
| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
443-
| | \--- com.google.android.gms:play-services-basement:17.0.0 (*)
444-
| +--- com.google.android.gms:play-services-tasks:17.0.0
445-
| | \--- com.google.android.gms:play-services-basement:17.0.0 (*)
446-
| +--- com.google.firebase:firebase-common:19.3.0
447-
| | +--- com.google.android.gms:play-services-basement:17.0.0 (*)
448-
| | +--- com.google.android.gms:play-services-tasks:17.0.0 (*)
449-
| | +--- com.google.auto.value:auto-value-annotations:1.6.5
450-
| | \--- com.google.firebase:firebase-components:16.0.0
451-
| | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
452-
| +--- com.google.firebase:firebase-components:16.0.0 (*)
453-
| +--- com.google.firebase:firebase-datatransport:17.0.3
427+
| +--- com.google.firebase:firebase-common:20.0.0
428+
| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
429+
| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.1
430+
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
431+
| | \--- com.google.firebase:firebase-components:17.0.0
432+
| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
433+
| | \--- com.google.firebase:firebase-annotations:16.0.0
434+
| +--- com.google.firebase:firebase-common-ktx:20.0.0
454435
| | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
455-
| | +--- com.google.android.datatransport:transport-api:2.1.0 -> 2.2.0
456-
| | +--- com.google.android.datatransport:transport-backend-cct:2.1.0 -> 2.2.0 (*)
457-
| | +--- com.google.android.datatransport:transport-runtime:2.1.0 -> 2.2.0 (*)
458-
| | \--- com.google.firebase:firebase-common:19.3.0 (*)
459-
| +--- com.google.firebase:firebase-encoders-json:16.0.0 (*)
460-
| +--- com.google.firebase:firebase-iid:20.2.0
436+
| | +--- com.google.firebase:firebase-common:20.0.0 (*)
437+
| | +--- com.google.firebase:firebase-components:17.0.0 (*)
438+
| | \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.31 (*)
439+
| +--- com.google.firebase:firebase-components:17.0.0 (*)
440+
| +--- com.google.firebase:firebase-messaging:23.0.0
461441
| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
462442
| | +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
463-
| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
464-
| | +--- com.google.android.gms:play-services-basement:17.0.0 (*)
465-
| | +--- com.google.android.gms:play-services-stats:17.0.0 (*)
466-
| | +--- com.google.android.gms:play-services-tasks:17.0.0 (*)
467-
| | +--- com.google.firebase:firebase-common:19.3.0 (*)
468-
| | +--- com.google.firebase:firebase-components:16.0.0 (*)
469-
| | +--- com.google.firebase:firebase-iid-interop:17.0.0
470-
| | | +--- com.google.android.gms:play-services-base:17.0.0
443+
| | +--- com.google.android.datatransport:transport-api:3.0.0
444+
| | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
445+
| | +--- com.google.android.datatransport:transport-backend-cct:3.0.0
446+
| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
447+
| | | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
448+
| | | +--- com.google.android.datatransport:transport-runtime:3.0.0
449+
| | | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
450+
| | | | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
451+
| | | | \--- javax.inject:javax.inject:1
452+
| | | +--- com.google.firebase:firebase-encoders:17.0.0
453+
| | | | \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
454+
| | | \--- com.google.firebase:firebase-encoders-json:18.0.0
455+
| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
456+
| | | \--- com.google.firebase:firebase-encoders:17.0.0 (*)
457+
| | +--- com.google.android.datatransport:transport-runtime:3.0.0 (*)
458+
| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
459+
| | +--- com.google.android.gms:play-services-cloud-messaging:17.0.0
460+
| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
461+
| | | \--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.1 (*)
462+
| | +--- com.google.android.gms:play-services-stats:17.0.0 -> 17.0.2
463+
| | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
464+
| | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
465+
| | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.1 (*)
466+
| | +--- com.google.firebase:firebase-common:20.0.0 (*)
467+
| | +--- com.google.firebase:firebase-components:17.0.0 (*)
468+
| | +--- com.google.firebase:firebase-datatransport:18.0.0
469+
| | | +--- androidx.annotation:annotation:1.1.0 -> 1.2.0
470+
| | | +--- com.google.android.datatransport:transport-api:3.0.0 (*)
471+
| | | +--- com.google.android.datatransport:transport-backend-cct:3.0.0 (*)
472+
| | | +--- com.google.android.datatransport:transport-runtime:3.0.0 (*)
473+
| | | +--- com.google.firebase:firebase-common:20.0.0 (*)
474+
| | | \--- com.google.firebase:firebase-components:17.0.0 (*)
475+
| | +--- com.google.firebase:firebase-iid-interop:17.1.0
476+
| | | +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
477+
| | | \--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.1 (*)
478+
| | +--- com.google.firebase:firebase-installations:17.0.0
479+
| | | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.1 (*)
480+
| | | +--- com.google.firebase:firebase-common:20.0.0 (*)
481+
| | | +--- com.google.firebase:firebase-components:17.0.0 (*)
482+
| | | \--- com.google.firebase:firebase-installations-interop:17.0.0
483+
| | | +--- com.google.android.gms:play-services-tasks:17.0.0 -> 18.0.1 (*)
484+
| | | \--- com.google.firebase:firebase-annotations:16.0.0
485+
| | +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
486+
| | \--- com.google.firebase:firebase-measurement-connector:19.0.0
487+
| | +--- com.google.android.gms:play-services-basement:17.0.0 -> 18.0.0 (*)
488+
| | \--- com.google.firebase:firebase-annotations:16.0.0
489+
| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72 -> 1.5.31 (*)
490+
+--- com.google.firebase:firebase-analytics-ktx:20.0.2
491+
| +--- com.google.firebase:firebase-analytics:20.0.2
492+
| | +--- com.google.android.gms:play-services-measurement:20.0.2
493+
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
494+
| | | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
495+
| | | +--- com.google.android.gms:play-services-ads-identifier:18.0.0
496+
| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
497+
| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
498+
| | | +--- com.google.android.gms:play-services-measurement-base:20.0.2
499+
| | | | \--- com.google.android.gms:play-services-basement:18.0.0 (*)
500+
| | | +--- com.google.android.gms:play-services-measurement-impl:20.0.2
471501
| | | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
472502
| | | | +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
473-
| | | | +--- androidx.fragment:fragment:1.0.0 -> 1.3.6 (*)
474-
| | | | +--- com.google.android.gms:play-services-basement:17.0.0 (*)
475-
| | | | \--- com.google.android.gms:play-services-tasks:17.0.0 (*)
476-
| | | \--- com.google.android.gms:play-services-basement:17.0.0 (*)
477-
| | +--- com.google.firebase:firebase-installations:16.3.1
478-
| | | +--- com.google.android.gms:play-services-tasks:17.0.0 (*)
479-
| | | +--- com.google.firebase:firebase-common:19.3.0 (*)
480-
| | | +--- com.google.firebase:firebase-components:16.0.0 (*)
481-
| | | \--- com.google.firebase:firebase-installations-interop:16.0.0
482-
| | | \--- com.google.android.gms:play-services-tasks:17.0.0 (*)
483-
| | \--- com.google.firebase:firebase-installations-interop:16.0.0 (*)
484-
| +--- com.google.firebase:firebase-installations:16.3.1 (*)
485-
| +--- com.google.firebase:firebase-installations-interop:16.0.0 (*)
486-
| \--- com.google.firebase:firebase-measurement-connector:18.0.0
487-
| \--- com.google.android.gms:play-services-basement:17.0.0 (*)
488-
+--- com.google.firebase:firebase-analytics:17.4.2
489-
| +--- com.google.android.gms:play-services-measurement:17.4.2
490-
| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
491-
| | +--- androidx.legacy:legacy-support-core-utils:1.0.0 (*)
492-
| | +--- com.google.android.gms:play-services-basement:17.0.0 (*)
493-
| | +--- com.google.android.gms:play-services-measurement-base:17.4.2
494-
| | | \--- com.google.android.gms:play-services-basement:17.0.0 (*)
495-
| | +--- com.google.android.gms:play-services-measurement-impl:17.4.2
496-
| | | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
497-
| | | +--- androidx.core:core:1.0.0 -> 1.5.0 (*)
498-
| | | +--- com.google.android.gms:play-services-ads-identifier:17.0.0
499-
| | | | \--- com.google.android.gms:play-services-basement:17.0.0 (*)
500-
| | | +--- com.google.android.gms:play-services-basement:17.0.0 (*)
501-
| | | +--- com.google.android.gms:play-services-measurement-base:17.4.2 (*)
502-
| | | \--- com.google.android.gms:play-services-stats:17.0.0 (*)
503-
| | \--- com.google.android.gms:play-services-stats:17.0.0 (*)
504-
| +--- com.google.android.gms:play-services-measurement-api:17.4.2
505-
| | +--- com.google.android.gms:play-services-basement:17.0.0 (*)
506-
| | +--- com.google.android.gms:play-services-measurement-base:17.4.2 (*)
507-
| | +--- com.google.android.gms:play-services-measurement-impl:17.4.2 (*)
508-
| | +--- com.google.android.gms:play-services-measurement-sdk-api:17.4.2
509-
| | | +--- com.google.android.gms:play-services-basement:17.0.0 (*)
510-
| | | \--- com.google.android.gms:play-services-measurement-base:17.4.2 (*)
511-
| | +--- com.google.android.gms:play-services-tasks:17.0.0 (*)
512-
| | +--- com.google.firebase:firebase-common:19.3.0 (*)
513-
| | +--- com.google.firebase:firebase-components:16.0.0 (*)
514-
| | +--- com.google.firebase:firebase-iid:20.1.5 -> 20.2.0 (*)
515-
| | \--- com.google.firebase:firebase-measurement-connector:18.0.0 (*)
516-
| \--- com.google.android.gms:play-services-measurement-sdk:17.4.2
517-
| +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
518-
| +--- com.google.android.gms:play-services-basement:17.0.0 (*)
519-
| +--- com.google.android.gms:play-services-measurement-base:17.4.2 (*)
520-
| \--- com.google.android.gms:play-services-measurement-impl:17.4.2 (*)
503+
| | | | +--- com.google.android.gms:play-services-ads-identifier:18.0.0 (*)
504+
| | | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
505+
| | | | +--- com.google.android.gms:play-services-measurement-base:20.0.2 (*)
506+
| | | | \--- com.google.android.gms:play-services-stats:17.0.2 (*)
507+
| | | \--- com.google.android.gms:play-services-stats:17.0.2 (*)
508+
| | +--- com.google.android.gms:play-services-measurement-api:20.0.2
509+
| | | +--- com.google.android.gms:play-services-ads-identifier:18.0.0 (*)
510+
| | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
511+
| | | +--- com.google.android.gms:play-services-measurement-base:20.0.2 (*)
512+
| | | +--- com.google.android.gms:play-services-measurement-sdk-api:20.0.2
513+
| | | | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
514+
| | | | \--- com.google.android.gms:play-services-measurement-base:20.0.2 (*)
515+
| | | +--- com.google.android.gms:play-services-tasks:18.0.1 (*)
516+
| | | +--- com.google.firebase:firebase-common:20.0.0 (*)
517+
| | | +--- com.google.firebase:firebase-components:17.0.0 (*)
518+
| | | +--- com.google.firebase:firebase-installations:17.0.0 (*)
519+
| | | +--- com.google.firebase:firebase-installations-interop:17.0.0 (*)
520+
| | | \--- com.google.firebase:firebase-measurement-connector:19.0.0 (*)
521+
| | \--- com.google.android.gms:play-services-measurement-sdk:20.0.2
522+
| | +--- androidx.collection:collection:1.0.0 -> 1.1.0 (*)
523+
| | +--- com.google.android.gms:play-services-basement:18.0.0 (*)
524+
| | +--- com.google.android.gms:play-services-measurement-base:20.0.2 (*)
525+
| | \--- com.google.android.gms:play-services-measurement-impl:20.0.2 (*)
526+
| +--- com.google.firebase:firebase-common:20.0.0 (*)
527+
| +--- com.google.firebase:firebase-common-ktx:20.0.0 (*)
528+
| +--- com.google.firebase:firebase-components:17.0.0 (*)
529+
| \--- org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.50 -> 1.5.31 (*)
521530
+--- com.chibatching.kotpref:kotpref:2.13.2
522531
| \--- androidx.annotation:annotation:1.1.0 -> 1.2.0
523532
+--- com.chibatching.kotpref:gson-support:2.13.2
@@ -618,5 +627,5 @@ You can use '--warning-mode all' to show the individual deprecation warnings and
618627

619628
See https://docs.gradle.org/7.2/userguide/command_line_interface.html#sec:command_line_warnings
620629

621-
BUILD SUCCESSFUL in 1s
630+
BUILD SUCCESSFUL in 8s
622631
1 actionable task: 1 executed

0 commit comments

Comments
 (0)