瀏覽代碼

Minor refactoring

Vadik Sirekanyan 7 年之前
父節點
當前提交
0f5be2b996

+ 1 - 3
app/src/main/java/me/vadik/knigopis/MainActivity.kt

@@ -163,9 +163,7 @@ class MainActivity : AppCompatActivity(), Router {
     }
 
     override fun openBrowser(uri: Uri) {
-        startActivityOrElse(Intent(ACTION_VIEW, uri)) {
-            toast(R.string.users_info_no_browser)
-        }
+        startActivityOrNull(Intent(ACTION_VIEW, uri)) ?: toast(R.string.users_info_no_browser)
     }
 
     private fun initNavigationView() {

+ 2 - 5
app/src/main/java/me/vadik/knigopis/extensions.kt

@@ -34,13 +34,10 @@ import io.reactivex.schedulers.Schedulers
 private const val TAG = "Knigopis"
 private val HTTP_SCHEMES = setOf("http", "https")
 
-inline fun Context.startActivityOrElse(intent: Intent, onError: () -> Unit) {
-    if (packageManager.resolveActivity(intent, 0) == null) {
-        onError()
-    } else {
+fun Context.startActivityOrNull(intent: Intent): Unit? =
+    packageManager.resolveActivity(intent, 0)?.let {
         startActivity(intent)
     }
-}
 
 fun Context.toast(@StringRes messageId: Int, vararg args: Any) =
     Toast.makeText(this, getString(messageId, *args), Toast.LENGTH_SHORT).show()