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
14e80ca7
Commit
14e80ca7
authored
Oct 17, 2017
by
Rune Jensen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed issue in observer that observed items being deleted
Changed delete action to use same permission as edit
parent
5f0937d3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
MessagePopup.java
...at/rocket/android/layouthelper/chatroom/MessagePopup.java
+2
-1
DeletedMessageObserver.java
...cket/android/service/observer/DeletedMessageObserver.java
+0
-1
No files found.
app/src/main/java/chat/rocket/android/layouthelper/chatroom/MessagePopup.java
View file @
14e80ca7
...
@@ -37,7 +37,7 @@ public class MessagePopup {
...
@@ -37,7 +37,7 @@ public class MessagePopup {
private
static
final
Action
QUOTE_ACTION_INFO
=
new
Action
(
"Quote"
,
null
,
true
);
private
static
final
Action
QUOTE_ACTION_INFO
=
new
Action
(
"Quote"
,
null
,
true
);
private
static
final
Action
EDIT_ACTION_INFO
=
new
Action
(
"Edit"
,
null
,
true
);
private
static
final
Action
EDIT_ACTION_INFO
=
new
Action
(
"Edit"
,
null
,
true
);
private
static
final
Action
COPY_ACTION_INFO
=
new
Action
(
"Copy"
,
null
,
true
);
private
static
final
Action
COPY_ACTION_INFO
=
new
Action
(
"Copy"
,
null
,
true
);
private
static
final
Action
DELETE_ACTION_INFO
=
new
Action
(
"Delete"
,
null
,
tru
e
);
private
static
final
Action
DELETE_ACTION_INFO
=
new
Action
(
"Delete"
,
null
,
fals
e
);
private
final
List
<
Action
>
defaultActions
=
new
ArrayList
<>(
5
);
private
final
List
<
Action
>
defaultActions
=
new
ArrayList
<>(
5
);
private
final
List
<
Action
>
otherActions
=
new
ArrayList
<>();
private
final
List
<
Action
>
otherActions
=
new
ArrayList
<>();
private
Message
message
;
private
Message
message
;
...
@@ -74,6 +74,7 @@ public class MessagePopup {
...
@@ -74,6 +74,7 @@ public class MessagePopup {
.
subscribe
(
.
subscribe
(
pair
->
{
pair
->
{
EDIT_ACTION_INFO
.
allowed
=
pair
.
second
;
EDIT_ACTION_INFO
.
allowed
=
pair
.
second
;
DELETE_ACTION_INFO
.
allowed
=
pair
.
second
;
List
<
Action
>
allActions
=
singleton
.
defaultActions
;
List
<
Action
>
allActions
=
singleton
.
defaultActions
;
List
<
Action
>
allowedActions
=
new
ArrayList
<>(
3
);
List
<
Action
>
allowedActions
=
new
ArrayList
<>(
3
);
for
(
int
i
=
0
;
i
<
allActions
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
allActions
.
size
();
i
++)
{
...
...
app/src/main/java/chat/rocket/android/service/observer/DeletedMessageObserver.java
View file @
14e80ca7
...
@@ -44,7 +44,6 @@ public class DeletedMessageObserver extends AbstractModelObserver<RealmMessage>
...
@@ -44,7 +44,6 @@ public class DeletedMessageObserver extends AbstractModelObserver<RealmMessage>
public
RealmResults
<
RealmMessage
>
queryItems
(
Realm
realm
)
{
public
RealmResults
<
RealmMessage
>
queryItems
(
Realm
realm
)
{
return
realm
.
where
(
RealmMessage
.
class
)
return
realm
.
where
(
RealmMessage
.
class
)
.
equalTo
(
RealmMessage
.
SYNC_STATE
,
SyncState
.
DELETE_NOT_SYNCED
)
.
equalTo
(
RealmMessage
.
SYNC_STATE
,
SyncState
.
DELETE_NOT_SYNCED
)
.
equalTo
(
RealmMessage
.
SYNC_STATE
,
SyncState
.
DELETING
)
.
isNotNull
(
RealmMessage
.
ROOM_ID
)
.
isNotNull
(
RealmMessage
.
ROOM_ID
)
.
findAll
();
.
findAll
();
}
}
...
...
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