Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

[IMPROVEMENT] Avoid closing the app from some screens. #1998

Merged
philipbrito merged 3 commits into from
Jan 15, 2019
Merged

[IMPROVEMENT] Avoid closing the app from some screens. #1998

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a7aaf7
Fix app close on back button press
dev-ritik Jan 15, 2019
01536b4
Fix formatting issue.
philipbrito Jan 15, 2019
7a5202f
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android i…
philipbrito Jan 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import chat.rocket.android.BuildConfig
import chat.rocket.android.R
import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
import chat.rocket.android.main.adapter.AccountsAdapter
import chat.rocket.android.main.adapter.Selector
import chat.rocket.android.main.presentation.MainPresenter
Expand Down Expand Up @@ -98,6 +99,21 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
}
}

override fun onBackPressed() {
if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
closeDrawer()
} else {
supportFragmentManager.findFragmentById(R.id.fragment_container)?.let {
if (it !is ChatRoomsFragment && supportFragmentManager.backStackEntryCount == 0) {
presenter.toChatList(chatRoomId)
setCheckedNavDrawerItem(R.id.menu_action_chats)
} else {
super.onBackPressed()
}
}
}
}

override fun activityInjector(): AndroidInjector<Activity> = activityDispatchingAndroidInjector

override fun supportFragmentInjector(): AndroidInjector<Fragment> =
Expand Down