Skip to content
This repository was archived by the owner on Dec 16, 2023. It is now read-only.

Commit c809e9a

Browse files
MarkNjungeMarkNjunge
committed
Code cleanup
1 parent 39bd1ea commit c809e9a

7 files changed

Lines changed: 59 additions & 55 deletions

File tree

‎app/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ apply plugin: 'io.fabric'
66

77
android {
88
compileSdkVersion 27
9-
buildToolsVersion '27.0.3'
109
defaultConfig {
1110
applicationId "com.marknkamau.justjava"
1211
minSdkVersion 21

‎app/src/main/java/com/marknkamau/justjava/data/network/authentication/AuthenticationService.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import com.google.firebase.auth.FirebaseAuth
55
interface AuthenticationService {
66
fun addAuthListener(listener: FirebaseAuth.AuthStateListener)
77

8-
fun createUser(email: String, password: String, listener: AuthActionListener?)
8+
fun createUser(email: String, password: String, listener: AuthActionListener)
99

10-
fun signIn(email: String, password: String, listener: AuthActionListener?)
10+
fun signIn(email: String, password: String, listener: AuthActionListener)
1111

12-
fun sendPasswordResetEmail(email: String, listener: AuthActionListener?)
12+
fun sendPasswordResetEmail(email: String, listener: AuthActionListener)
1313

14-
fun setUserDisplayName(name: String, listener: AuthActionListener?)
14+
fun setUserDisplayName(name: String, listener: AuthActionListener)
1515

1616
fun getUserId(): String?
1717

‎app/src/main/java/com/marknkamau/justjava/data/network/authentication/AuthenticationServiceImpl.kt‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import com.google.firebase.auth.UserProfileChangeRequest
55

66
object AuthenticationServiceImpl : AuthenticationService {
77

8-
98
private val firebaseAuth: FirebaseAuth by lazy { FirebaseAuth.getInstance() }
109

1110
private var isSignedIn = false
@@ -20,40 +19,33 @@ object AuthenticationServiceImpl : AuthenticationService {
2019
firebaseAuth.addAuthStateListener(listener)
2120
}
2221

23-
override fun createUser(email: String, password: String, listener: AuthenticationService.AuthActionListener?) {
22+
override fun createUser(email: String, password: String, listener: AuthenticationService.AuthActionListener) {
2423
firebaseAuth.createUserWithEmailAndPassword(email, password)
25-
.addOnSuccessListener { listener?.actionSuccessful("User created successfully") }
26-
.addOnFailureListener { exception -> listener?.actionFailed(exception.message) }
24+
.addOnSuccessListener { listener.actionSuccessful("User created successfully") }
25+
.addOnFailureListener { exception -> listener.actionFailed(exception.message) }
2726
}
2827

29-
override fun signIn(email: String, password: String, listener: AuthenticationService.AuthActionListener?) {
28+
override fun signIn(email: String, password: String, listener: AuthenticationService.AuthActionListener) {
3029
firebaseAuth.signInWithEmailAndPassword(email, password)
31-
.addOnSuccessListener { listener?.actionSuccessful(getUserId()!!) }
32-
.addOnFailureListener { exception -> listener?.actionFailed(exception.message) }
30+
.addOnSuccessListener { listener.actionSuccessful(it.user.uid) }
31+
.addOnFailureListener { exception -> listener.actionFailed(exception.message) }
3332
}
3433

35-
override fun sendPasswordResetEmail(email: String, listener: AuthenticationService.AuthActionListener?) {
34+
override fun sendPasswordResetEmail(email: String, listener: AuthenticationService.AuthActionListener) {
3635
firebaseAuth.sendPasswordResetEmail(email)
37-
.addOnSuccessListener { listener?.actionSuccessful("Password reset email sent") }
38-
.addOnFailureListener { exception -> listener?.actionFailed(exception.message) }
36+
.addOnSuccessListener { listener.actionSuccessful("Password reset email sent") }
37+
.addOnFailureListener { exception -> listener.actionFailed(exception.message) }
3938
}
4039

41-
override fun setUserDisplayName(name: String, listener: AuthenticationService.AuthActionListener?) {
40+
override fun setUserDisplayName(name: String, listener: AuthenticationService.AuthActionListener) {
4241
val profileUpdate = UserProfileChangeRequest.Builder().setDisplayName(name).build()
4342

4443
firebaseAuth.currentUser?.updateProfile(profileUpdate)
45-
?.addOnSuccessListener { listener?.actionSuccessful("User display name set") }
46-
?.addOnFailureListener { exception -> listener?.actionFailed(exception.message) }
44+
?.addOnSuccessListener { listener.actionSuccessful("User display name set") }
45+
?.addOnFailureListener { exception -> listener.actionFailed(exception.message) }
4746
}
4847

49-
override fun getUserId(): String? {
50-
return if(isSignedIn){
51-
firebaseAuth.currentUser!!.uid
52-
}else{
53-
null
54-
}
55-
56-
}
48+
override fun getUserId() = if (isSignedIn) firebaseAuth.currentUser!!.uid else null
5749

5850
override fun isSignedIn() = isSignedIn
5951

‎app/src/main/java/com/marknkamau/justjava/data/network/db/DatabaseServiceImpl.kt‎

Lines changed: 38 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.marknkamau.justjava.data.network.db
22

3+
import com.crashlytics.android.Crashlytics
34
import com.google.firebase.firestore.*
45
import com.google.firebase.iid.FirebaseInstanceId
56
import com.marknkamau.justjava.data.models.Order
@@ -22,25 +23,29 @@ class DatabaseServiceImpl : DatabaseService {
2223
fireStore.collection("users")
2324
.document(userDetails.id)
2425
.set(userDetails)
25-
.addOnSuccessListener {
26-
listener.onSuccess()
27-
}
28-
.addOnFailureListener { exception ->
29-
listener.onError(exception.message ?: "Error saving user details")
26+
.addOnSuccessListener { listener.onSuccess() }
27+
.addOnFailureListener {
28+
Timber.e(it)
29+
Crashlytics.logException(it)
30+
listener.onError(it.message ?: "Error saving user details")
3031
}
3132

3233
}
3334

3435
override fun updateUserDetails(id: String, name: String, phone: String, address: String, listener: DatabaseService.WriteListener) {
36+
val userDetailsMap = mapOf(
37+
"name" to name,
38+
"phone" to phone,
39+
"address" to address
40+
)
41+
3542
fireStore.collection("users")
3643
.document(id)
37-
.update(
38-
"name", name,
39-
"phone", phone,
40-
"address", address
41-
)
44+
.update(userDetailsMap)
4245
.addOnSuccessListener { listener.onSuccess() }
4346
.addOnFailureListener {
47+
Timber.e(it)
48+
Crashlytics.logException(it)
4449
listener.onError(it.message ?: "Error updating user details")
4550
}
4651
}
@@ -59,8 +64,10 @@ class DatabaseServiceImpl : DatabaseService {
5964
)
6065
listener.onSuccess(userDetails)
6166
}
62-
.addOnFailureListener { exception ->
63-
listener.onError(exception.message ?: "Error getting user details")
67+
.addOnFailureListener {
68+
Timber.e(it)
69+
Crashlytics.logException(it)
70+
listener.onError(it.message ?: "Error getting user details")
6471
}
6572
}
6673

@@ -114,6 +121,7 @@ class DatabaseServiceImpl : DatabaseService {
114121
.addOnSuccessListener { listener.onSuccess() }
115122
.addOnFailureListener {
116123
Timber.e(it)
124+
Crashlytics.logException(it)
117125
listener.onError(it.message ?: "Error placing order")
118126
}
119127
}
@@ -146,6 +154,7 @@ class DatabaseServiceImpl : DatabaseService {
146154
}
147155
.addOnFailureListener {
148156
Timber.e(it)
157+
Crashlytics.logException(it)
149158
listener.onError(it.message ?: "Error getting previous orders")
150159
}
151160

@@ -176,25 +185,29 @@ class DatabaseServiceImpl : DatabaseService {
176185

177186
listener.onSuccess(items)
178187
}
179-
.addOnFailureListener { e ->
180-
Timber.e(e)
181-
listener.onError(e.message ?: "Error getting order items")
188+
.addOnFailureListener {
189+
Timber.e(it)
190+
Crashlytics.logException(it)
191+
listener.onError(it.message ?: "Error getting order items")
182192
}
183193
}
184194

185195
override fun savePaymentRequest(merchantRequestId: String, checkoutRequestId: String, orderId: String, customerId: String) {
186196
val map = mapOf(
187-
Pair(DatabaseKeys.Payment.CHECKOUT_REQUEST_ID, checkoutRequestId),
188-
Pair(DatabaseKeys.Payment.MERCHANT_REQUEST_ID, merchantRequestId),
189-
Pair(DatabaseKeys.Payment.ORDER_ID, orderId),
190-
Pair(DatabaseKeys.Payment.CUSTOMER_ID, customerId),
191-
Pair(DatabaseKeys.Payment.STATUS, "pending")
197+
DatabaseKeys.Payment.CHECKOUT_REQUEST_ID to checkoutRequestId,
198+
DatabaseKeys.Payment.MERCHANT_REQUEST_ID to merchantRequestId,
199+
DatabaseKeys.Payment.ORDER_ID to orderId,
200+
DatabaseKeys.Payment.CUSTOMER_ID to customerId,
201+
DatabaseKeys.Payment.STATUS to "pending"
192202
)
193203

194204
fireStore.collection("payments")
195205
.document()
196206
.set(map)
197-
.addOnFailureListener { exception -> Timber.e(exception) }
207+
.addOnFailureListener {
208+
Timber.e(it)
209+
Crashlytics.logException(it)
210+
}
198211
}
199212

200213
override fun getOrder(orderId: String, listener: DatabaseService.OrderListener) {
@@ -220,9 +233,10 @@ class DatabaseServiceImpl : DatabaseService {
220233
listener.onSuccess(order)
221234
}
222235
}
223-
.addOnFailureListener { e ->
224-
Timber.e(e)
225-
listener.onError(e.message ?: "Error getting order items")
236+
.addOnFailureListener {
237+
Timber.e(it)
238+
Crashlytics.logException(it)
239+
listener.onError(it.message ?: "Error getting order items")
226240
}
227241
}
228242

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ buildscript {
1717

1818
}
1919
dependencies {
20-
classpath 'com.android.tools.build:gradle:3.1.4'
20+
classpath 'com.android.tools.build:gradle:3.2.0'
2121
classpath 'com.google.gms:google-services:4.1.0'
2222
classpath 'com.jakewharton:butterknife-gradle-plugin:8.6.0'
2323
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Apr 30 16:47:32 EAT 2018
1+
#Sun Oct 07 11:08:11 EAT 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

‎justjavastaff/build.gradle‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ apply plugin: 'kotlin-android-extensions'
55

66
android {
77
compileSdkVersion 27
8-
buildToolsVersion '27.0.3'
98

109
defaultConfig {
1110
applicationId "com.marknkamau.justjavastaff"
@@ -27,7 +26,7 @@ android {
2726

2827
dependencies {
2928
implementation fileTree(dir: 'libs', include: ['*.jar'])
30-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
29+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
3130

3231
// Android libraries
3332
implementation "com.android.support:design:$support_version"

0 commit comments

Comments
 (0)