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
bfe320af
Commit
bfe320af
authored
May 30, 2018
by
Lucio Maciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Check only for name and text for last message
parent
357c9afe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
build.gradle
app/build.gradle
+2
-2
RoomMapper.kt
.../java/chat/rocket/android/chatrooms/adapter/RoomMapper.kt
+1
-1
No files found.
app/build.gradle
View file @
bfe320af
...
@@ -12,8 +12,8 @@ android {
...
@@ -12,8 +12,8 @@ android {
applicationId
"chat.rocket.android"
applicationId
"chat.rocket.android"
minSdkVersion
21
minSdkVersion
21
targetSdkVersion
versions
.
targetSdk
targetSdkVersion
versions
.
targetSdk
versionCode
202
2
versionCode
202
3
versionName
"2.
3
.0"
versionName
"2.
4
.0"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled
true
multiDexEnabled
true
}
}
...
...
app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomMapper.kt
View file @
bfe320af
...
@@ -90,7 +90,7 @@ class RoomMapper(private val context: Application,
...
@@ -90,7 +90,7 @@ class RoomMapper(private val context: Application,
private
fun
mapLastMessage
(
name
:
String
?,
fullName
:
String
?,
text
:
String
?,
unread
:
Boolean
):
CharSequence
?
{
private
fun
mapLastMessage
(
name
:
String
?,
fullName
:
String
?,
text
:
String
?,
unread
:
Boolean
):
CharSequence
?
{
return
if
(!
settings
.
showLastMessage
())
{
return
if
(!
settings
.
showLastMessage
())
{
null
null
}
else
if
(
name
!=
null
&&
fullName
!=
null
&&
text
!=
null
)
{
}
else
if
(
name
!=
null
&&
text
!=
null
)
{
val
user
=
if
(
localRepository
.
checkIfMyself
(
name
))
{
val
user
=
if
(
localRepository
.
checkIfMyself
(
name
))
{
"${context.getString(R.string.msg_you)}: "
"${context.getString(R.string.msg_you)}: "
}
else
{
}
else
{
...
...
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