Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
QuasselDroid-ng
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
66
Issues
66
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Janne Koschinski
QuasselDroid-ng
Commits
4f781879
Verified
Commit
4f781879
authored
May 24, 2019
by
Janne Koschinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes buffer search not working
parent
fc4fdf28
Pipeline
#494
canceled with stages
in 0 seconds
Changes
6
Pipelines
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
290 additions
and
304 deletions
+290
-304
app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
...main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
+2
-2
app/src/main/java/de/kuschku/quasseldroid/ui/info/user/UserInfoFragment.kt
.../de/kuschku/quasseldroid/ui/info/user/UserInfoFragment.kt
+0
-2
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
...ava/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
+0
-3
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/helper/ArchiveViewModelHelper.kt
...u/quasseldroid/viewmodel/helper/ArchiveViewModelHelper.kt
+2
-2
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/helper/ChatViewModelHelper.kt
...chku/quasseldroid/viewmodel/helper/ChatViewModelHelper.kt
+7
-3
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/helper/QuasselViewModelHelper.kt
...u/quasseldroid/viewmodel/helper/QuasselViewModelHelper.kt
+279
-292
No files found.
app/src/main/java/de/kuschku/quasseldroid/ui/chat/ChatActivity.kt
View file @
4f781879
...
...
@@ -365,8 +365,8 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
accountDatabase
.
accounts
().
listenDefaultFiltered
(
accountId
,
0
).
toObservable
()
)
val
maxBufferActivity
=
modelHelper
.
process
Raw
BufferList
(
modelHelper
.
bufferViewConfig
,
filtered
).
map
{
(
config
,
bufferList
)
->
val
maxBufferActivity
=
modelHelper
.
processBufferList
(
modelHelper
.
bufferViewConfig
,
filtered
).
map
{
(
config
,
bufferList
)
->
val
minimumActivity
:
Buffer_Activity
=
config
?.
minimumActivity
()
?.
enabledValues
()
?.
max
()
?:
Buffer_Activity
.
NoActivity
...
...
app/src/main/java/de/kuschku/quasseldroid/ui/info/user/UserInfoFragment.kt
View file @
4f781879
...
...
@@ -66,7 +66,6 @@ import de.kuschku.quasseldroid.util.service.ServiceBoundFragment
import
de.kuschku.quasseldroid.util.ui.BetterLinkMovementMethod
import
de.kuschku.quasseldroid.util.ui.LinkLongClickMenuHelper
import
de.kuschku.quasseldroid.viewmodel.data.Avatar
import
de.kuschku.quasseldroid.viewmodel.data.BufferHiddenState
import
de.kuschku.quasseldroid.viewmodel.data.BufferProps
import
de.kuschku.quasseldroid.viewmodel.data.BufferStatus
import
de.kuschku.quasseldroid.viewmodel.helper.EditorViewModelHelper
...
...
@@ -241,7 +240,6 @@ class UserInfoFragment : ServiceBoundFragment() {
description
=
it
.
topic
(),
activity
=
Message_Type
.
of
(),
bufferStatus
=
bufferStatus
,
hiddenState
=
BufferHiddenState
.
VISIBLE
,
networkConnectionState
=
user
.
network
().
connectionState
(),
fallbackDrawable
=
fallbackDrawable
)
...
...
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferProps.kt
View file @
4f781879
...
...
@@ -37,7 +37,6 @@ data class BufferProps(
val
bufferActivity
:
Buffer_Activities
=
BufferInfo
.
Activity
.
of
(
BufferInfo
.
Activity
.
NoActivity
),
val
hiddenState
:
BufferHiddenState
,
val
ircUser
:
IrcUser
?
=
null
,
val
avatarUrls
:
List
<
Avatar
>
=
emptyList
(),
val
fallbackDrawable
:
Drawable
?
=
null
,
...
...
@@ -57,7 +56,6 @@ data class BufferProps(
if
(
activity
!=
other
.
activity
)
return
false
if
(
highlights
!=
other
.
highlights
)
return
false
if
(
bufferActivity
!=
other
.
bufferActivity
)
return
false
if
(
hiddenState
!=
other
.
hiddenState
)
return
false
if
(
ircUser
!=
other
.
ircUser
)
return
false
if
(
avatarUrls
!=
other
.
avatarUrls
)
return
false
...
...
@@ -73,7 +71,6 @@ data class BufferProps(
result
=
31
*
result
+
activity
.
hashCode
()
result
=
31
*
result
+
highlights
result
=
31
*
result
+
bufferActivity
.
hashCode
()
result
=
31
*
result
+
hiddenState
.
hashCode
()
result
=
31
*
result
+
(
ircUser
?.
hashCode
()
?:
0
)
result
=
31
*
result
+
avatarUrls
.
hashCode
()
return
result
...
...
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/helper/ArchiveViewModelHelper.kt
View file @
4f781879
...
...
@@ -45,7 +45,7 @@ open class ArchiveViewModelHelper @Inject constructor(
showHandle
:
Boolean
,
filtered
:
Observable
<
Pair
<
Map
<
BufferId
,
Int
>,
Int
>>
)
=
filterBufferList
(
process
Raw
BufferList
(
processBufferList
(
bufferViewConfig
,
filtered
,
bufferListType
=
bufferListType
,
...
...
@@ -60,5 +60,5 @@ open class ArchiveViewModelHelper @Inject constructor(
showHandle
)
val
selectedBuffer
=
processSelectedBuffer
(
archive
.
selectedBufferId
,
bufferViewConfig
)
val
selectedBuffer
=
processSelectedBuffer
(
archive
.
selectedBufferId
)
}
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/helper/ChatViewModelHelper.kt
View file @
4f781879
...
...
@@ -170,14 +170,18 @@ open class ChatViewModelHelper @Inject constructor(
val
nickDataThrottled
=
nickData
.
distinctUntilChanged
().
throttleLast
(
100
,
TimeUnit
.
MILLISECONDS
)
val
selectedBuffer
=
processSelectedBuffer
(
chat
.
selectedBufferId
,
bufferViewConfig
)
val
selectedBuffer
=
processSelectedBuffer
(
chat
.
selectedBufferId
)
fun
processChatBufferList
(
filtered
:
Observable
<
Pair
<
Map
<
BufferId
,
Int
>,
Int
>>
)
=
filterBufferList
(
processRawBufferList
(
bufferViewConfig
,
filtered
),
processBufferList
(
bufferViewConfig
,
filtered
,
bufferSearch
=
chat
.
bufferSearch
),
chat
.
expandedNetworks
,
chat
.
selectedBufferId
,
false
showHandle
=
false
)
}
viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/helper/QuasselViewModelHelper.kt
View file @
4f781879
This diff is collapsed.
Click to expand it.
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