Skip to content

Commit 40bd78b

Browse files
author
Kasim Rangwala
committed
version 1.01
1 parent 7c4a3a4 commit 40bd78b

File tree

4 files changed

+13
-15
lines changed

4 files changed

+13
-15
lines changed
0 Bytes
Binary file not shown.

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ android {
2929
applicationId "io.gripxtech.odoojsonrpcclient"
3030
minSdkVersion 17
3131
targetSdkVersion 27
32-
versionCode 1
33-
versionName "1.0"
32+
versionCode 2
33+
versionName "1.01"
3434
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
3535
vectorDrawables.useSupportLibrary = true
3636
}

app/src/main/java/io/gripxtech/odoojsonrpcclient/core/authenticator/SplashActivity.kt

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import io.gripxtech.odoojsonrpcclient.*
1111
import io.gripxtech.odoojsonrpcclient.core.Odoo
1212
import io.gripxtech.odoojsonrpcclient.core.OdooUser
1313
import io.gripxtech.odoojsonrpcclient.core.entities.session.authenticate.AuthenticateResult
14+
import io.gripxtech.odoojsonrpcclient.core.utils.android.ktx.subscribeEx
1415
import io.reactivex.Observable
15-
import io.reactivex.Observer
1616
import io.reactivex.android.schedulers.AndroidSchedulers
1717
import io.reactivex.disposables.CompositeDisposable
1818
import io.reactivex.disposables.Disposable
@@ -139,27 +139,25 @@ class SplashActivity : AppCompatActivity() {
139139
}
140140
.subscribeOn(Schedulers.io())
141141
.observeOn(AndroidSchedulers.mainThread())
142-
.subscribe(object : Observer<Boolean> {
143-
override fun onSubscribe(d: Disposable) {
142+
.subscribeEx {
143+
onSubscribe { _: Disposable ->
144144
// Must be complete, not dispose in between
145145
// compositeDisposable.add(d)
146146
}
147147

148-
override fun onNext(t: Boolean) {
148+
onNext { t: Boolean ->
149149
if (t) {
150150
restartApp()
151151
} else {
152152
closeApp()
153153
}
154154
}
155155

156-
override fun onError(e: Throwable) {
157-
e.printStackTrace()
158-
closeApp(message = e.message ?: getString(R.string.generic_error))
156+
onError { error: Throwable ->
157+
error.printStackTrace()
158+
closeApp(message = error.message ?: getString(R.string.generic_error))
159159
}
160-
161-
override fun onComplete() = Unit
162-
})
160+
}
163161
}
164162

165163
private fun startLoginActivity() {
@@ -168,8 +166,7 @@ class SplashActivity : AppCompatActivity() {
168166
}
169167

170168
private fun startMainActivity() {
171-
// startActivity(Intent(this@SplashActivity, MainActivity::class.java))
172-
startActivity(Intent(this@SplashActivity, SomeActivity::class.java))
169+
startActivity(Intent(this@SplashActivity, MainActivity::class.java))
173170
finish()
174171
}
175172

app/src/main/java/io/gripxtech/odoojsonrpcclient/core/utils/NavHeaderViewHolder.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import io.gripxtech.odoojsonrpcclient.App
1010
import io.gripxtech.odoojsonrpcclient.GlideApp
1111
import io.gripxtech.odoojsonrpcclient.R
1212
import io.gripxtech.odoojsonrpcclient.core.OdooUser
13+
import io.gripxtech.odoojsonrpcclient.trimFalse
1314

1415
class NavHeaderViewHolder(view: View) {
1516
val pic: CircleImageView = view.findViewById(R.id.userImage)
@@ -22,7 +23,7 @@ class NavHeaderViewHolder(view: View) {
2223
fun setUser(user: OdooUser) {
2324
name.text = user.name
2425
email.text = user.login
25-
if (user.imageSmall != "false") {
26+
if (user.imageSmall.trimFalse().isNotEmpty()) {
2627
val byteArray = Base64.decode(user.imageSmall, Base64.DEFAULT)
2728
GlideApp.with(pic.context)
2829
.asBitmap()

0 commit comments

Comments
 (0)