Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
cbe1b477
Unverified
Commit
cbe1b477
authored
Mar 06, 2019
by
Abdalrahman Atef
Committed by
GitHub
Mar 06, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into TitleIssue
parents
9bceb937
affddd02
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+1
-0
MainActivity.kt
...src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+6
-0
No files found.
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
cbe1b477
...
...
@@ -316,6 +316,7 @@ class ChatRoomPresenter @Inject constructor(
fun
sendMessage
(
chatRoomId
:
String
,
text
:
String
,
messageId
:
String
?)
{
launchUI
(
strategy
)
{
try
{
view
.
disableSendMessageButton
()
// ignore message for now, will receive it on the stream
if
(
messageId
==
null
)
{
val
id
=
UUID
.
randomUUID
().
toString
()
...
...
app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
View file @
cbe1b477
...
...
@@ -38,6 +38,9 @@ import kotlinx.android.synthetic.main.activity_main.*
import
kotlinx.android.synthetic.main.app_bar.*
import
kotlinx.android.synthetic.main.nav_header.view.*
import
javax.inject.Inject
import
android.app.NotificationManager
import
android.content.Context
private
const
val
CURRENT_STATE
=
"current_state"
...
...
@@ -90,6 +93,9 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
presenter
.
toChatList
(
chatRoomId
)
isFragmentAdded
=
true
}
val
notificationManager
=
getSystemService
(
Context
.
NOTIFICATION_SERVICE
)
as
NotificationManager
notificationManager
.
cancelAll
()
}
override
fun
onDestroy
()
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment