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
79d1fbfb
Commit
79d1fbfb
authored
Oct 31, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'beta' into release/3.0.1-hotfix
parents
4b61077d
ec79b326
Changes
31
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
485 additions
and
94 deletions
+485
-94
config.yml
.circleci/config.yml
+41
-28
build-sdk.sh
app/build-sdk.sh
+2
-2
ChatRoomAdapter.kt
...a/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
+5
-1
ChatRoomPresenter.kt
...rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+56
-1
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+4
-1
MessageActionsBottomSheet.kt
...roid/chatroom/ui/bottomsheet/MessageActionsBottomSheet.kt
+1
-1
AttachmentUiModel.kt
...chat/rocket/android/chatroom/uimodel/AttachmentUiModel.kt
+1
-0
BaseUiModel.kt
.../java/chat/rocket/android/chatroom/uimodel/BaseUiModel.kt
+1
-0
MessageReplyUiModel.kt
...at/rocket/android/chatroom/uimodel/MessageReplyUiModel.kt
+2
-1
MessageUiModel.kt
...va/chat/rocket/android/chatroom/uimodel/MessageUiModel.kt
+2
-1
UiModelMapper.kt
...ava/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+45
-32
UrlPreviewUiModel.kt
...chat/rocket/android/chatroom/uimodel/UrlPreviewUiModel.kt
+2
-1
ChatRoomSuggestionUiModel.kt
.../chatroom/uimodel/suggestion/ChatRoomSuggestionUiModel.kt
+6
-4
CommandSuggestionUiModel.kt
...d/chatroom/uimodel/suggestion/CommandSuggestionUiModel.kt
+5
-3
PeopleSuggestionUiModel.kt
...id/chatroom/uimodel/suggestion/PeopleSuggestionUiModel.kt
+9
-7
MessageHelper.kt
...src/main/java/chat/rocket/android/helper/MessageHelper.kt
+3
-2
MessageParser.kt
...src/main/java/chat/rocket/android/helper/MessageParser.kt
+247
-3
ic_action_message_link_24dp.xml
app/src/main/res/drawable/ic_action_message_link_24dp.xml
+10
-0
message_actions.xml
app/src/main/res/menu/message_actions.xml
+5
-0
strings.xml
app/src/main/res/values-de/strings.xml
+4
-0
strings.xml
app/src/main/res/values-es/strings.xml
+3
-0
strings.xml
app/src/main/res/values-fr/strings.xml
+4
-0
strings.xml
app/src/main/res/values-hi-rIN/strings.xml
+4
-1
strings.xml
app/src/main/res/values-ja/strings.xml
+4
-0
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+3
-0
strings.xml
app/src/main/res/values-ru-rRU/strings.xml
+4
-0
strings.xml
app/src/main/res/values-tr/strings.xml
+4
-0
strings.xml
app/src/main/res/values-uk/strings.xml
+4
-0
strings.xml
app/src/main/res/values/strings.xml
+2
-0
build.gradle
build.gradle
+1
-4
dependencies.gradle
dependencies.gradle
+1
-1
No files found.
.circleci/config.yml
View file @
79d1fbfb
version
:
2
build
:
machine
:
java
:
oraclejdk8
jobs
:
build-kotlin-sdk
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
...
...
@@ -18,8 +21,9 @@ jobs:
command
:
pushd app/ ; ./build-sdk.sh ; popd
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.gradle/wrapper
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
-
save_cache
:
paths
:
-
app/libs/
...
...
@@ -30,47 +34,51 @@ jobs:
destination
:
libs
code-analysis
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
name
:
ANDROID_HOME
command
:
echo "sdk.dir="$ANDROID_HOME > local.properties
command
:
echo "sdk.dir="$ANDROID_HOME > local.properties
-
run
:
name
:
checkout Rocket.Chat.Kotlin.SDK
command
:
git clone https://github.com/RocketChat/Rocket.Chat.Kotlin.SDK.git ../Rocket.Chat.Kotlin.SDK
-
restore_cache
:
key
:
kotlin-sdk-{{ .Revision }}
-
restore_cache
:
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
-
run
:
name
:
Download Dependencies
command
:
./gradlew androidDependencies --quiet --console=plain
command
:
./gradlew
--no-daemon
androidDependencies --quiet --console=plain
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.gradle/wrapper
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
-
run
:
name
:
Run Lint
#, Checkstyles, PMD, Findbugs...
command
:
./gradlew lint
command
:
./gradlew
--no-daemon
lint
-
run
:
name
:
Run Unit test
command
:
./gradlew test
command
:
./gradlew
--no-daemon
test
-
run
:
name
:
Compile Instrumentation test
command
:
./gradlew assembleAndroidTest
command
:
./gradlew
--no-daemon
assembleAndroidTest
-
store_artifacts
:
path
:
app/build/reports/
destination
:
reports
build-play-apk
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
name
:
ANDROID_HOME
command
:
echo "sdk.dir="$ANDROID_HOME > local.properties
-
run
:
name
:
restore files from ENV
command
:
|
...
...
@@ -82,28 +90,32 @@ jobs:
-
restore_cache
:
key
:
kotlin-sdk-{{ .Revision }}
-
restore_cache
:
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
-
run
:
name
:
Download Dependencies
command
:
./gradlew androidDependencies --quiet --console=plain
command
:
./gradlew
--no-daemon
androidDependencies --quiet --console=plain
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.gradle/wrapper
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
-
run
:
name
:
Build APK
command
:
|
./gradlew assemblePlayRelease --info --console=plain --stacktrace
./gradlew
--no-daemon
assemblePlayRelease --info --console=plain --stacktrace
-
store_artifacts
:
path
:
app/build/outputs/apk
destination
:
apks
build-foss-apk
:
docker
:
-
image
:
circleci/android:api-2
7
-alpha
-
image
:
circleci/android:api-2
8
-alpha
environment
:
J
VM_OPTS
:
-Xmx3200
m
J
AVA_TOOL_OPTIONS
:
-Xmx5024
m
steps
:
-
checkout
-
run
:
name
:
ANDROID_HOME
command
:
echo "sdk.dir="$ANDROID_HOME > local.properties
-
run
:
name
:
restore files from ENV
command
:
|
...
...
@@ -115,18 +127,19 @@ jobs:
-
restore_cache
:
key
:
kotlin-sdk-{{ .Revision }}
-
restore_cache
:
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
-
run
:
name
:
Download Dependencies
command
:
./gradlew androidDependencies --quiet --console=plain
command
:
./gradlew
--no-daemon
androidDependencies --quiet --console=plain
-
save_cache
:
paths
:
-
~/.gradle
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}
-
~/.gradle/caches
-
~/.gradle/wrapper
key
:
jars-{{ checksum "build.gradle" }}-{{ checksum "app/build.gradle" }}-{{ checksum "player/build.gradle" }}-{{ checksum "core/build.gradle" }}-{{ checksum "util/build.gradle" }}-{{ checksum "draw/build.gradle" }}-{{ checksum "emoji/build.gradle" }}-{{ checksum "suggestions/build.gradle" }}
-
run
:
name
:
Build APK
command
:
|
./gradlew assembleFossRelease --info --console=plain --stacktrace
./gradlew
--no-daemon
assembleFossRelease --info --console=plain --stacktrace
-
store_artifacts
:
path
:
app/build/outputs/apk
destination
:
apks
...
...
app/build-sdk.sh
View file @
79d1fbfb
...
...
@@ -94,8 +94,8 @@ if ! check_git_dirty && ! check_last_commit && [ -f "${CURRENT_DIR}"/libs/common
exit
0
fi
cd
"
${
SDK_DIR
}
"
&&
./gradlew common:assemble
&&
cd
"
${
CURRENT_DIR
}
"
cd
"
${
SDK_DIR
}
"
&&
./gradlew core:assemble
&&
cd
"
${
CURRENT_DIR
}
"
cd
"
${
SDK_DIR
}
"
&&
./gradlew
--no-daemon
common:assemble
&&
cd
"
${
CURRENT_DIR
}
"
cd
"
${
SDK_DIR
}
"
&&
./gradlew
--no-daemon
core:assemble
&&
cd
"
${
CURRENT_DIR
}
"
rm
"
${
CURRENT_DIR
}
"
/libs/common
*
"
${
CURRENT_DIR
}
"
/libs/core
*
...
...
app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt
View file @
79d1fbfb
...
...
@@ -248,6 +248,9 @@ class ChatRoomAdapter(
R
.
id
.
action_menu_msg_react
->
{
actionSelectListener
?.
showReactions
(
id
)
}
R
.
id
.
action_message_permalink
->
{
actionSelectListener
?.
copyPermalink
(
id
)
}
else
->
{
TODO
(
"Not implemented"
)
}
...
...
@@ -267,5 +270,6 @@ class ChatRoomAdapter(
fun
showReactions
(
id
:
String
)
fun
openDirectMessage
(
roomName
:
String
,
message
:
String
)
fun
sendMessage
(
chatRoomId
:
String
,
text
:
String
)
fun
copyPermalink
(
id
:
String
)
}
}
\ No newline at end of file
}
app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
View file @
79d1fbfb
...
...
@@ -505,7 +505,7 @@ class ChatRoomPresenter @Inject constructor(
val
messages
=
retryIO
(
description
=
"history($chatRoomId, $roomType, $instant)"
)
{
client
.
history
(
chatRoomId
,
roomType
,
count
=
50
,
chatRoomId
,
roomType
,
count
=
50
,
oldest
=
instant
)
}
...
...
@@ -622,6 +622,7 @@ class ChatRoomPresenter @Inject constructor(
try
{
messagesRepository
.
getById
(
messageId
)
?.
let
{
m
->
view
.
copyToClipboard
(
m
.
message
)
view
.
showMessage
(
R
.
string
.
msg_message_copied
)
}
}
catch
(
e
:
RocketChatException
)
{
Timber
.
e
(
e
)
...
...
@@ -859,6 +860,42 @@ class ChatRoomPresenter @Inject constructor(
}
}
// TODO: move this to new interactor or FetchChatRoomsInteractor?
private
suspend
fun
getChatRoomAsync
(
roomId
:
String
):
ChatRoom
?
=
withContext
(
CommonPool
)
{
return
@withContext
dbManager
.
chatRoomDao
().
get
(
roomId
)
?.
let
{
with
(
it
.
chatRoom
)
{
ChatRoom
(
id
=
id
,
subscriptionId
=
subscriptionId
,
type
=
roomTypeOf
(
type
),
unread
=
unread
,
broadcast
=
broadcast
?:
false
,
alert
=
alert
,
fullName
=
fullname
,
name
=
name
,
favorite
=
favorite
?:
false
,
default
=
isDefault
?:
false
,
readonly
=
readonly
,
open
=
open
,
lastMessage
=
null
,
archived
=
false
,
status
=
null
,
user
=
null
,
userMentions
=
userMentions
,
client
=
client
,
announcement
=
null
,
description
=
null
,
groupMentions
=
groupMentions
,
roles
=
null
,
topic
=
null
,
lastSeen
=
this
.
lastSeen
,
timestamp
=
timestamp
,
updatedAt
=
updatedAt
)
}
}
}
// TODO: move this to new interactor or FetchChatRoomsInteractor?
private
suspend
fun
getChatRoomsAsync
(
name
:
String
?
=
null
):
List
<
ChatRoom
>
=
withContext
(
CommonPool
)
{
return
@withContext
dbManager
.
chatRoomDao
().
getAllSync
().
filter
{
...
...
@@ -941,6 +978,24 @@ class ChatRoomPresenter @Inject constructor(
}
}
fun
copyPermalink
(
messageId
:
String
)
{
launchUI
(
strategy
)
{
try
{
messagesRepository
.
getById
(
messageId
)
?.
let
{
message
->
getChatRoomAsync
(
message
.
roomId
)
?.
let
{
chatRoom
->
val
models
=
mapper
.
map
(
message
)
models
.
firstOrNull
()
?.
permalink
?.
let
{
view
.
copyToClipboard
(
it
)
view
.
showMessage
(
R
.
string
.
msg_permalink_copied
)
}
}
}
}
catch
(
ex
:
Exception
)
{
Timber
.
e
(
ex
)
}
}
}
/**
* Send an emoji reaction to a message.
*/
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
79d1fbfb
...
...
@@ -621,7 +621,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
ui
{
val
clipboard
=
it
.
getSystemService
(
Context
.
CLIPBOARD_SERVICE
)
as
ClipboardManager
clipboard
.
primaryClip
=
ClipData
.
newPlainText
(
""
,
message
)
showToast
(
R
.
string
.
msg_message_copied
)
}
}
...
...
@@ -1059,6 +1058,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
}
}
override
fun
copyPermalink
(
id
:
String
)
{
presenter
.
copyPermalink
(
id
)
}
override
fun
showReactions
(
id
:
String
)
{
presenter
.
showReactions
(
id
)
}
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/bottomsheet/MessageActionsBottomSheet.kt
View file @
79d1fbfb
...
...
@@ -73,4 +73,4 @@ class MessageActionsBottomSheet : BottomSheetDialogFragment() {
}
}
}
}
\ No newline at end of file
}
app/src/main/java/chat/rocket/android/chatroom/uimodel/AttachmentUiModel.kt
View file @
79d1fbfb
...
...
@@ -17,6 +17,7 @@ data class AttachmentUiModel(
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
permalink
:
String
,
val
id
:
Long
,
val
title
:
CharSequence
?,
val
description
:
CharSequence
?,
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/BaseUiModel.kt
View file @
79d1fbfb
...
...
@@ -17,6 +17,7 @@ interface BaseUiModel<out T> {
var
currentDayMarkerText
:
String
var
showDayMarker
:
Boolean
var
menuItemsToHide
:
MutableList
<
Int
>
var
permalink
:
String
enum
class
ViewType
(
val
viewType
:
Int
)
{
MESSAGE
(
0
),
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageReplyUiModel.kt
View file @
79d1fbfb
...
...
@@ -15,7 +15,8 @@ data class MessageReplyUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseUiModel
<
MessageReply
>
{
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE_REPLY
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/MessageUiModel.kt
View file @
79d1fbfb
...
...
@@ -20,7 +20,8 @@ data class MessageUiModel(
override
var
unread
:
Boolean
?
=
null
,
var
isFirstUnread
:
Boolean
,
override
var
isTemporary
:
Boolean
=
false
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
()
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
permalink
:
String
)
:
BaseMessageUiModel
<
Message
>
{
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
MESSAGE
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
View file @
79d1fbfb
...
...
@@ -123,23 +123,26 @@ class UiModelMapper @Inject constructor(
withContext
(
CommonPool
)
{
val
list
=
ArrayList
<
BaseUiModel
<*>>()
message
.
urls
?.
forEach
{
url
->
mapUrl
(
message
,
url
)
?.
let
{
list
.
add
(
it
)
}
}
getChatRoomAsync
(
message
.
roomId
)
?.
let
{
chatRoom
->
message
.
urls
?.
forEach
{
url
->
mapUrl
(
message
,
url
,
chatRoom
)
?.
let
{
list
.
add
(
it
)
}
}
message
.
attachments
?.
mapNotNull
{
attachment
->
mapAttachment
(
message
,
attachment
)
}
?.
asReversed
()
?.
let
{
list
.
addAll
(
it
)
}
message
.
attachments
?.
mapNotNull
{
attachment
->
mapAttachment
(
message
,
attachment
,
chatRoom
)
}
?.
asReversed
()
?.
let
{
list
.
addAll
(
it
)
}
mapMessage
(
message
).
let
{
if
(
list
.
isNotEmpty
())
{
it
.
preview
=
list
.
first
().
preview
mapMessage
(
message
,
chatRoom
).
let
{
if
(
list
.
isNotEmpty
())
{
it
.
preview
=
list
.
first
().
preview
}
list
.
add
(
it
)
}
list
.
add
(
it
)
}
for
(
i
in
list
.
size
-
1
downTo
0
)
{
val
next
=
if
(
i
-
1
<
0
)
null
else
list
[
i
-
1
]
list
[
i
].
nextDownStreamMessage
=
next
...
...
@@ -206,24 +209,26 @@ class UiModelMapper @Inject constructor(
withContext
(
CommonPool
)
{
val
list
=
ArrayList
<
BaseUiModel
<*>>()
mapMessage
(
message
).
let
{
if
(
list
.
isNotEmpty
())
{
it
.
preview
=
list
.
first
().
preview
getChatRoomAsync
(
message
.
roomId
)
?.
let
{
chatRoom
->
mapMessage
(
message
,
chatRoom
).
let
{
if
(
list
.
isNotEmpty
())
{
it
.
preview
=
list
.
first
().
preview
}
list
.
add
(
it
)
}
list
.
add
(
it
)
}
message
.
attachments
?.
forEach
{
val
attachment
=
mapAttachment
(
message
,
it
)
attachment
?.
let
{
list
.
add
(
attachment
)
message
.
attachments
?.
forEach
{
val
attachment
=
mapAttachment
(
message
,
it
,
chatRoom
)
attachment
?.
let
{
list
.
add
(
attachment
)
}
}
}
message
.
urls
?.
forEach
{
val
url
=
mapUrl
(
message
,
it
)
url
?.
let
{
list
.
add
(
url
)
message
.
urls
?.
forEach
{
val
url
=
mapUrl
(
message
,
it
,
chatRoom
)
url
?.
let
{
list
.
add
(
url
)
}
}
}
...
...
@@ -275,11 +280,12 @@ class UiModelMapper @Inject constructor(
nextDownStreamMessage
=
null
,
unread
=
message
.
unread
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
false
showDayMarker
=
false
,
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
)
}
private
fun
mapUrl
(
message
:
Message
,
url
:
Url
):
BaseUiModel
<
*
>?
{
private
fun
mapUrl
(
message
:
Message
,
url
:
Url
,
chatRoom
:
ChatRoom
):
BaseUiModel
<
*
>?
{
if
(
url
.
ignoreParse
||
url
.
meta
==
null
)
return
null
val
hostname
=
url
.
parsedUrl
?.
hostname
?:
""
...
...
@@ -289,13 +295,14 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
return
UrlPreviewUiModel
(
message
,
url
,
message
.
id
,
title
,
hostname
,
description
,
thumb
,
getReactions
(
message
),
preview
=
message
.
copy
(
message
=
url
.
url
),
unread
=
message
.
unread
,
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
)
showDayMarker
=
false
,
currentDayMarkerText
=
dayMarkerText
,
permalink
=
permalink
)
}
private
fun
mapAttachment
(
message
:
Message
,
attachment
:
Attachment
):
BaseUiModel
<
*
>?
{
private
fun
mapAttachment
(
message
:
Message
,
attachment
:
Attachment
,
chatRoom
:
ChatRoom
):
BaseUiModel
<
*
>?
{
return
with
(
attachment
)
{
val
content
=
stripMessageQuotes
(
message
)
val
id
=
attachmentId
(
message
,
attachment
)
...
...
@@ -303,6 +310,7 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
fieldsText
=
mapFields
(
fields
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
val
attachmentAuthor
=
attachment
.
authorName
val
time
=
attachment
.
timestamp
?.
let
{
getTime
(
it
)
}
...
...
@@ -327,6 +335,7 @@ class UiModelMapper @Inject constructor(
unread
=
message
.
unread
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
false
,
permalink
=
permalink
,
id
=
id
,
title
=
attachmentTitle
,
description
=
attachmentDescription
,
...
...
@@ -421,7 +430,10 @@ class UiModelMapper @Inject constructor(
return
attachment
.
description
}
private
suspend
fun
mapMessage
(
message
:
Message
):
MessageUiModel
=
withContext
(
CommonPool
)
{
private
suspend
fun
mapMessage
(
message
:
Message
,
chatRoom
:
ChatRoom
):
MessageUiModel
=
withContext
(
CommonPool
)
{
val
sender
=
getSenderName
(
message
)
val
time
=
getTime
(
message
.
timestamp
)
val
avatar
=
getUserAvatar
(
message
)
...
...
@@ -435,13 +447,14 @@ class UiModelMapper @Inject constructor(
val
localDateTime
=
DateTimeHelper
.
getLocalDateTime
(
message
.
timestamp
)
val
dayMarkerText
=
DateTimeHelper
.
getFormattedDateForMessages
(
localDateTime
,
context
)
val
permalink
=
messageHelper
.
createPermalink
(
message
,
chatRoom
,
false
)
val
content
=
getContent
(
stripMessageQuotes
(
message
))
MessageUiModel
(
message
=
stripMessageQuotes
(
message
),
rawData
=
message
,
messageId
=
message
.
id
,
avatar
=
avatar
!!
,
time
=
time
,
senderName
=
sender
,
content
=
content
,
isPinned
=
message
.
pinned
,
currentDayMarkerText
=
dayMarkerText
,
showDayMarker
=
false
,
reactions
=
getReactions
(
message
),
isFirstUnread
=
false
,
preview
=
preview
,
isTemporary
=
!
synced
,
unread
=
unread
)
preview
=
preview
,
isTemporary
=
!
synced
,
unread
=
unread
,
permalink
=
permalink
)
}
private
fun
mapMessagePreview
(
message
:
Message
):
Message
{
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/UrlPreviewUiModel.kt
View file @
79d1fbfb
...
...
@@ -19,7 +19,8 @@ data class UrlPreviewUiModel(
override
var
unread
:
Boolean
?
=
null
,
override
var
menuItemsToHide
:
MutableList
<
Int
>
=
mutableListOf
(),
override
var
currentDayMarkerText
:
String
,
override
var
showDayMarker
:
Boolean
override
var
showDayMarker
:
Boolean
,
override
var
permalink
:
String
)
:
BaseUiModel
<
Url
>
{
override
val
viewType
:
Int
get
()
=
BaseUiModel
.
ViewType
.
URL_PREVIEW
.
viewType
...
...
app/src/main/java/chat/rocket/android/chatroom/uimodel/suggestion/ChatRoomSuggestionUiModel.kt
View file @
79d1fbfb
...
...
@@ -2,7 +2,9 @@ package chat.rocket.android.chatroom.uimodel.suggestion
import
chat.rocket.android.suggestions.model.SuggestionModel
class
ChatRoomSuggestionUiModel
(
text
:
String
,
val
fullName
:
String
,
val
name
:
String
,
searchList
:
List
<
String
>)
:
SuggestionModel
(
text
,
searchList
,
false
)
\ No newline at end of file
class
ChatRoomSuggestionUiModel
(
text
:
String
,
val
fullName
:
String
,
val
name
:
String
,
searchList
:
List
<
String
>
)
:
SuggestionModel
(
text
,
searchList
,
false
)
app/src/main/java/chat/rocket/android/chatroom/uimodel/suggestion/CommandSuggestionUiModel.kt
View file @
79d1fbfb
...
...
@@ -2,6 +2,8 @@ package chat.rocket.android.chatroom.uimodel.suggestion
import
chat.rocket.android.suggestions.model.SuggestionModel
class
CommandSuggestionUiModel
(
text
:
String
,
val
description
:
String
,
searchList
:
List
<
String
>)
:
SuggestionModel
(
text
,
searchList
)
\ No newline at end of file
class
CommandSuggestionUiModel
(
text
:
String
,
val
description
:
String
,
searchList
:
List
<
String
>
)
:
SuggestionModel
(
text
,
searchList
)
\ No newline at end of file
app/src/main/java/chat/rocket/android/chatroom/uimodel/suggestion/PeopleSuggestionUiModel.kt
View file @
79d1fbfb
...
...
@@ -3,13 +3,15 @@ package chat.rocket.android.chatroom.uimodel.suggestion
import
chat.rocket.android.suggestions.model.SuggestionModel
import
chat.rocket.common.model.UserStatus
class
PeopleSuggestionUiModel
(
val
imageUri
:
String
?,
text
:
String
,
val
username
:
String
,
val
name
:
String
,
val
status
:
UserStatus
?,
pinned
:
Boolean
=
false
,
searchList
:
List
<
String
>)
:
SuggestionModel
(
text
,
searchList
,
pinned
)
{
class
PeopleSuggestionUiModel
(
val
imageUri
:
String
?,
text
:
String
,
val
username
:
String
,
val
name
:
String
,
val
status
:
UserStatus
?,
pinned
:
Boolean
=
false
,
searchList
:
List
<
String
>
)
:
SuggestionModel
(
text
,
searchList
,
pinned
)
{
override
fun
toString
():
String
{
return
"PeopleSuggestionUiModel(imageUri='$imageUri', username='$username', name='$name', status=$status, pinned=$pinned)"
...
...
app/src/main/java/chat/rocket/android/helper/MessageHelper.kt
View file @
79d1fbfb
...
...
@@ -17,7 +17,7 @@ class MessageHelper @Inject constructor(
private
val
currentServer
=
serverInteractor
.
get
()
!!
private
val
settings
:
PublicSettings
=
getSettingsInteractor
.
get
(
currentServer
)
fun
createPermalink
(
message
:
Message
,
chatRoom
:
ChatRoom
):
String
{
fun
createPermalink
(
message
:
Message
,
chatRoom
:
ChatRoom
,
markdownSyntax
:
Boolean
=
true
):
String
{
val
type
=
when
(
chatRoom
.
type
)
{
is
RoomType
.
PrivateGroup
->
"group"
is
RoomType
.
Channel
->
"channel"
...
...
@@ -30,7 +30,8 @@ class MessageHelper @Inject constructor(
}
else
{
chatRoom
.
name
}
return
"[ ]($currentServer/$type/$name?msg=${message.id}) "
val
permalink
=
"$currentServer/$type/$name?msg=${message.id}"
return
if
(
markdownSyntax
)
"[ ]($permalink) "
else
permalink
}
fun
messageIdFromPermalink
(
permalink
:
String
):
String
?
{
...
...
app/src/main/java/chat/rocket/android/helper/MessageParser.kt
View file @
79d1fbfb
This diff is collapsed.
Click to expand it.
app/src/main/res/drawable/ic_action_message_link_24dp.xml
0 → 100644
View file @
79d1fbfb
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"24dp"
android:height=
"24dp"
android:viewportWidth=
"20"
android:viewportHeight=
"20"
>
<path
android:fillColor=
"@color/actionMenuColor"
android:pathData=
"M9.548,14.23l-2.651,2.652a2.676,2.676 0,0 1,-3.78 0,2.676 2.676,0 0,1 0,-3.78L6.91,9.311a2.677,2.677 0,0 1,3.781 0,0.669 0.669,0 0,0 0.945,-0.946 4.015,4.015 0,0 0,-5.67 0l-3.792,3.792a4.014,4.014 0,0 0,0 5.67,4.014 4.014,0 0,0 5.67,0l2.65,-2.65a0.669,0.669 0,0 0,-0.945 -0.947zM17.828,2.173a4.014,4.014 0,0 0,-5.67 0L9.506,4.824a0.668,0.668 0,1 0,0.946 0.945l2.651,-2.651a2.676,2.676 0,0 1,3.78 0,2.676 2.676,0 0,1 0,3.78L13.09,10.69a2.678,2.678 0,0 1,-3.781 0,0.668 0.668,0 1,0 -0.945,0.945 4.015,4.015 0,0 0,5.67 0l3.793,-3.792a4.014,4.014 0,0 0,0 -5.67z"
/>
</vector>
app/src/main/res/menu/message_actions.xml
View file @
79d1fbfb
...
...
@@ -12,6 +12,11 @@
android:icon=
"@drawable/ic_action_message_reply_24dp"
android:title=
"@string/action_msg_reply"
/>
<item
android:id=
"@+id/action_message_permalink"
android:icon=
"@drawable/ic_action_message_link_24dp"
android:title=
"@string/action_msg_copy_permalink"
/>
<item
android:id=
"@+id/action_message_quote"
android:icon=
"@drawable/ic_action_message_quote_24dp"
...
...
app/src/main/res/values-de/strings.xml
View file @
79d1fbfb
...
...
@@ -162,6 +162,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
...
...
@@ -198,6 +200,8 @@
<string
name=
"action_msg_share"
>
Teilen
</string>
<string
name=
"action_title_editing"
>
Nachricht bearbeiten
</string>
<string
name=
"action_msg_add_reaction"
>
Reaktion hinzufügen
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Bearbeiten nicht erlaubt
</string>
...
...
app/src/main/res/values-es/strings.xml
View file @
79d1fbfb
...
...
@@ -159,6 +159,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
...
...
@@ -195,6 +197,7 @@
<string
name=
"action_msg_share"
>
Compartir
</string>
<string
name=
"action_title_editing"
>
Edición de mensaje
</string>
<string
name=
"action_msg_add_reaction"
>
Añadir una reacción
</string>
<string
name=
"action_msg_copy_permalink"
>
Copiar permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
La edición no és permitida
</string>
...
...
app/src/main/res/values-fr/strings.xml
View file @
79d1fbfb
...
...
@@ -152,6 +152,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Privé
</string>
...
...
@@ -201,6 +203,8 @@
<string
name=
"action_msg_share"
>
Partager
</string>
<string
name=
"action_title_editing"
>
Modification du message
</string>
<string
name=
"action_msg_add_reaction"
>
Ajouter une réaction
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
L\'édition n\'est pas autorisée
</string>
...
...
app/src/main/res/values-hi-rIN/strings.xml
View file @
79d1fbfb
...
...
@@ -163,6 +163,8 @@
<string
name=
"msg_channel_created_successfully"
>
चैनल सफलतापूर्वक बनाया गया
</string>
<string
name=
"msg_view_more"
>
और देखें
</string>
<string
name=
"msg_view_less"
>
कम देखें
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
एनालिटिक्स ट्रैकिंग
</string>
...
...
@@ -185,7 +187,6 @@
<string
name=
"message_role_removed"
>
%1$s अब %3$s द्वारा %2$s नहीं है
</string>
<string
name=
"message_credentials_saved_successfully"
>
प्रमाण पत्र सफलतापूर्वक सहेजे गए
</string>
<!-- Message actions -->
<string
name=
"action_msg_reply"
>
जवाब दें
</string>
<string
name=
"action_msg_info"
>
संदेश जानकारी
</string>
...
...
@@ -200,6 +201,8 @@
<string
name=
"action_msg_share"
>
शेयर करें
</string>
<string
name=
"action_title_editing"
>
संपादन संदेश
</string>
<string
name=
"action_msg_add_reaction"
>
प्रतिक्रिया जोड़ें
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
संपादन की अनुमति नहीं है
</string>
...
...
app/src/main/res/values-ja/strings.xml
View file @
79d1fbfb
...
...
@@ -167,6 +167,8 @@
<string
name=
"msg_message_copied"
>
メッセージをコピー
</string>
<string
name=
"msg_delete_message"
>
メッセージを削除
</string>
<string
name=
"msg_delete_description"
>
このメッセージを削除してもよろしいですか?
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
Analytics tracking
</string>
<!-- TODO Add translation -->
...
...
@@ -203,6 +205,8 @@
<string
name=
"action_msg_share"
>
Share
</string>
<string
name=
"action_title_editing"
>
メッセージの編集
</string>
<string
name=
"action_msg_add_reaction"
>
リアクションする
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
編集は許可されていません
</string>
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
79d1fbfb
...
...
@@ -150,6 +150,8 @@
<string
name=
"msg__your_2fa_code"
>
What’s your 2FA code?
</string>
<!-- TODO Add translation -->
<string
name=
"msg_view_more"
>
visualizar mais
</string>
<string
name=
"msg_view_less"
>
visualizar menos
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copiado
</string>
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Privado
</string>
...
...
@@ -199,6 +201,7 @@
<string
name=
"action_msg_share"
>
Compartilhar
</string>
<string
name=
"action_title_editing"
>
Editando mensagem
</string>
<string
name=
"action_msg_add_reaction"
>
Adicionar reação
</string>
<string
name=
"action_msg_copy_permalink"
>
Copiar permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Edição não permitida
</string>
...
...
app/src/main/res/values-ru-rRU/strings.xml
View file @
79d1fbfb
...
...
@@ -148,6 +148,8 @@
<string
name=
"msg__your_2fa_code"
>
Ваш код 2FA?
</string>
<string
name=
"msg_view_more"
>
больше
</string>
<string
name=
"msg_view_less"
>
меньше
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Приватный
</string>
...
...
@@ -196,6 +198,8 @@
<string
name=
"action_msg_share"
>
Поделиться
</string>
<string
name=
"action_title_editing"
>
Редактирование сообщения
</string>
<string
name=
"action_msg_add_reaction"
>
Отреагировать
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Редактирование запрещено
</string>
...
...
app/src/main/res/values-tr/strings.xml
View file @
79d1fbfb
...
...
@@ -164,6 +164,8 @@
<string
name=
"msg_delete_description"
>
Bu mesajı silmek istediğinizden emin misiniz
</string>
<string
name=
"msg_view_more"
>
Daha fazla göster
</string>
<string
name=
"msg_view_less"
>
Daha az göster
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Preferences messages -->
<string
name=
"msg_analytics_tracking"
>
İstatistik takibi
</string>
...
...
@@ -200,6 +202,8 @@
<string
name=
"action_msg_share"
>
Paylaş
</string>
<string
name=
"action_title_editing"
>
Mesaj Düzenleniyor
</string>
<string
name=
"action_msg_add_reaction"
>
Tepki Ekle
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Düzenlemeye izin verilmiyor
</string>
...
...
app/src/main/res/values-uk/strings.xml
View file @
79d1fbfb
...
...
@@ -149,6 +149,8 @@
<string
name=
"msg_view_more"
>
view more
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_view_less"
>
view less
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Приватний
</string>
...
...
@@ -197,6 +199,8 @@
<string
name=
"action_msg_share"
>
Поділитися
</string>
<string
name=
"action_title_editing"
>
Редагування повідомлення
</string>
<string
name=
"action_msg_add_reaction"
>
Відреагувати
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Редагування заборонено
</string>
...
...
app/src/main/res/values/strings.xml
View file @
79d1fbfb
...
...
@@ -160,6 +160,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string
name=
"msg_continue_with_wordpress"
>
Continue with
<b>
WordPress
</b></string>
<string
name=
"msg_two_factor_authentication"
>
Two-factor Authentication
</string>
<string
name=
"msg__your_2fa_code"
>
What’s your 2FA code?
</string>
<string
name=
"msg_permalink_copied"
>
Permalink copied
</string>
<!-- Create channel messages -->
<string
name=
"msg_private_channel"
>
Private
</string>
...
...
@@ -213,6 +214,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string
name=
"action_msg_share"
>
Share
</string>
<string
name=
"action_title_editing"
>
Editing Message
</string>
<string
name=
"action_msg_add_reaction"
>
Add reaction
</string>
<string
name=
"action_msg_copy_permalink"
>
Copy permalink
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Editing is not allowed
</string>
...
...
build.gradle
View file @
79d1fbfb
...
...
@@ -13,13 +13,10 @@ buildscript {
classpath
'com.android.tools.build:gradle:3.2.1'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
classpath
"org.jetbrains.dokka:dokka-gradle-plugin:${versions.dokka}"
classpath
'com.google.gms:google-services:4.
0.2
'
classpath
'com.google.gms:google-services:4.
1.0
'
classpath
'io.fabric.tools:gradle:1.25.4'
classpath
"com.github.ben-manes:gradle-versions-plugin:0.20.0"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
...
...
dependencies.gradle
View file @
79d1fbfb
...
...
@@ -9,7 +9,7 @@ ext {
dokka
:
'0.9.16'
,
// For app
kotlin
:
'1.2.
6
1'
,
kotlin
:
'1.2.
7
1'
,
coroutine
:
'0.25.0'
,
appCompat
:
'1.0.0'
,
...
...
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