FIX: currentFragment can be null - casting to not nullable type cause…

…d crashes
Qase · Dec 3, 2018 · a672579 · a672579
1 parent d7299c2
commit a672579
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/skeleton/src/main/java/com/qase/android/appskeleton/activity/BaseMainActivity.kt b/skeleton/src/main/java/com/qase/android/appskeleton/activity/BaseMainActivity.kt
@@ -24,7 +24,7 @@ abstract class BaseMainActivity : AppCompatActivity() {
 
     override fun onBackPressed() {
         val currentFragment = BaseApp.instance.fragmentManager.currentIFragment
-        if (currentFragment.onBackPressed()) {
+        if (currentFragment?.onBackPressed() == true) {
             Log.d("BaseMainActivity", "BackPressed Handled by Fragment: " + currentFragment.javaClass.canonicalName)
         } else if (onHandleBackPressed()) {
             Log.d("BaseMainActivity", "BackPressed Handled by Child Activity")

diff --git a/skeleton/src/main/java/com/qase/android/appskeleton/fragment/BaseFragmentManager.kt b/skeleton/src/main/java/com/qase/android/appskeleton/fragment/BaseFragmentManager.kt
@@ -245,8 +245,8 @@ class BaseFragmentManager {
     /**
      * @return Fragment to IFragment casted instance
      */
-    val currentIFragment: IFragment<*>
-        get() = currentFragment as IFragment<*>
+    val currentIFragment: IFragment<*>?
+        get() = currentFragment as IFragment<*>?
 
     /**
      * Get current fragment