From 7e27a317fead5a3bda6608bf63a0e3fdf8093fc4 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Sat, 15 Jan 2022 00:42:53 -0600
Subject: Added code for registering FCM token (HTTP 401 error)

---
 .../src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt     | 3 ++-
 .../java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt   | 5 ++++-
 .../java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt  | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'androidApp/src/main/java/mx')

diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
index 632b29a..b4a3411 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/TrackerApp.kt
@@ -29,13 +29,14 @@ open class TrackerApp : Application() {
         val appModule = module {
             single { "https://etbsa.net/api" }
             factory { SessionApi(get()) }
+            factory { UsersApi(get()) }
             factory { DevicesApi(get()) }
             factory { PositionsApi(get()) }
             factory { CommandsApi(get()) }
             factory { ReportsApi(get()) }
             factory { GeofencesApi(get()) }
 
-            factory { SessionController(get()) }
+            factory { SessionController(get(), get()) }
             factory { UnitsController(get(), get()) }
             factory { GeofencesController(get()) }
             factory { ReportController(get(), get()) }
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt
index 5071520..1cac5bd 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginFragment.kt
@@ -63,7 +63,10 @@ class LoginFragment : Fragment() {
         binding.signinButton.setOnClickListener {
             loginViewModel.login(
                 binding.usernameEditText.text.toString(),
-                binding.passwordEditText.text.toString()
+                binding.passwordEditText.text.toString(),
+                PreferenceManager
+                    .getDefaultSharedPreferences(activity)
+                    .getString(PREFERENCE_TOKEN, null)
             )
         }
     }
diff --git a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt
index 1585970..88b56cf 100644
--- a/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt
+++ b/androidApp/src/main/java/mx/trackermap/TrackerMap/android/session/LoginViewModel.kt
@@ -40,7 +40,7 @@ class LoginViewModel : ViewModel(), KoinComponent {
         sessionController.restoreSession()
     }
 
-    fun login(email: String, password: String) {
-        sessionController.login(SessionBody(email, password))
+    fun login(email: String, password: String, token: String?) {
+        sessionController.login(SessionBody(email, password, token))
     }
 }
\ No newline at end of file
-- 
cgit v1.2.3