Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
QuasselDroid-ng
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
QuasselDroid-ng
Commits
8976bd47
Verified
Commit
8976bd47
authored
6 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Fix issues with notification swiping
parent
3fbf9653
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#300
passed
6 years ago
Stage: build
Stage: deploy-local
Stage: deploy-beta
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
+6
-7
6 additions, 7 deletions
...in/java/de/kuschku/quasseldroid/service/QuasselService.kt
with
6 additions
and
7 deletions
app/src/main/java/de/kuschku/quasseldroid/service/QuasselService.kt
+
6
−
7
View file @
8976bd47
...
@@ -50,7 +50,6 @@ import de.kuschku.quasseldroid.persistence.AccountDatabase
...
@@ -50,7 +50,6 @@ import de.kuschku.quasseldroid.persistence.AccountDatabase
import
de.kuschku.quasseldroid.persistence.QuasselBacklogStorage
import
de.kuschku.quasseldroid.persistence.QuasselBacklogStorage
import
de.kuschku.quasseldroid.persistence.QuasselDatabase
import
de.kuschku.quasseldroid.persistence.QuasselDatabase
import
de.kuschku.quasseldroid.settings.ConnectionSettings
import
de.kuschku.quasseldroid.settings.ConnectionSettings
import
de.kuschku.quasseldroid.settings.MessageSettings
import
de.kuschku.quasseldroid.settings.NotificationSettings
import
de.kuschku.quasseldroid.settings.NotificationSettings
import
de.kuschku.quasseldroid.settings.Settings
import
de.kuschku.quasseldroid.settings.Settings
import
de.kuschku.quasseldroid.ssl.QuasselHostnameVerifier
import
de.kuschku.quasseldroid.ssl.QuasselHostnameVerifier
...
@@ -85,7 +84,9 @@ class QuasselService : DaggerLifecycleService(),
...
@@ -85,7 +84,9 @@ class QuasselService : DaggerLifecycleService(),
}
}
private
fun
update
()
{
private
fun
update
()
{
this
.
notificationSettings
=
Settings
.
notification
(
this
)
val
connectionSettings
=
Settings
.
connection
(
this
)
val
connectionSettings
=
Settings
.
connection
(
this
)
if
(
this
.
connectionSettings
.
showNotification
!=
connectionSettings
.
showNotification
)
{
if
(
this
.
connectionSettings
.
showNotification
!=
connectionSettings
.
showNotification
)
{
this
.
connectionSettings
=
connectionSettings
this
.
connectionSettings
=
connectionSettings
...
@@ -209,7 +210,7 @@ class QuasselService : DaggerLifecycleService(),
...
@@ -209,7 +210,7 @@ class QuasselService : DaggerLifecycleService(),
sessionManager
.
session
.
value
?.
bufferSyncer
?.
requestMarkBufferAsRead
(
bufferId
)
sessionManager
.
session
.
value
?.
bufferSyncer
?.
requestMarkBufferAsRead
(
bufferId
)
}
else
{
}
else
{
handlerService
.
backend
{
handlerService
.
backend
{
database
.
notifications
().
markHidden
(
bufferId
,
clear
MessageId
)
database
.
notifications
().
markHidden
(
bufferId
,
hide
MessageId
)
}
}
}
}
}
}
...
@@ -315,9 +316,6 @@ class QuasselService : DaggerLifecycleService(),
...
@@ -315,9 +316,6 @@ class QuasselService : DaggerLifecycleService(),
@Inject
@Inject
lateinit
var
accountDatabase
:
AccountDatabase
lateinit
var
accountDatabase
:
AccountDatabase
@Inject
lateinit
var
messageSettings
:
MessageSettings
private
val
connectivityReceiver
=
object
:
BroadcastReceiver
()
{
private
val
connectivityReceiver
=
object
:
BroadcastReceiver
()
{
override
fun
onReceive
(
context
:
Context
?,
intent
:
Intent
?)
{
override
fun
onReceive
(
context
:
Context
?,
intent
:
Intent
?)
{
if
(
context
!=
null
&&
intent
!=
null
)
{
if
(
context
!=
null
&&
intent
!=
null
)
{
...
@@ -503,9 +501,10 @@ class QuasselService : DaggerLifecycleService(),
...
@@ -503,9 +501,10 @@ class QuasselService : DaggerLifecycleService(),
context
:
Context
,
context
:
Context
,
disconnect
:
Boolean
?
=
null
,
disconnect
:
Boolean
?
=
null
,
markRead
:
BufferId
?
=
null
,
markRead
:
BufferId
?
=
null
,
markReadMessage
:
MsgId
?
=
null
markReadMessage
:
MsgId
?
=
null
,
hideMessage
:
MsgId
?
=
null
):
ComponentName
?
=
context
.
startService
(
):
ComponentName
?
=
context
.
startService
(
intent
(
context
,
disconnect
,
markRead
,
markReadMessage
)
intent
(
context
,
disconnect
,
markRead
,
markReadMessage
,
hideMessage
)
)
)
fun
intent
(
fun
intent
(
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment