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
06fa294b
Commit
06fa294b
authored
Oct 10, 2017
by
Leonardo Aramaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add support to custom room types fallbacking to group if not any of the defaults: p, c, d or l
parent
906cabca
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
59 additions
and
32 deletions
+59
-32
RestApiHelper.kt
...c/main/java/chat/rocket/android/api/rest/RestApiHelper.kt
+3
-3
ChannelRoomListHeader.java
...layouthelper/chatroom/roomlist/ChannelRoomListHeader.java
+2
-2
RoomListItemViewHolder.java
...ayouthelper/chatroom/roomlist/RoomListItemViewHolder.java
+1
-1
RestApiHelperTest.kt
.../kotlin/chat/rocket/android/api/rest/RestApiHelperTest.kt
+21
-21
Room.java
...chat-core/src/main/java/chat/rocket/core/models/Room.java
+2
-2
RoomSidebar.kt
...core/src/main/java/chat/rocket/core/models/RoomSidebar.kt
+3
-2
RoomType.java
...-core/src/main/java/chat/rocket/core/models/RoomType.java
+26
-0
SpotlightRoom.java
.../src/main/java/chat/rocket/core/models/SpotlightRoom.java
+1
-1
No files found.
app/src/main/java/chat/rocket/android/api/rest/RestApiHelper.kt
View file @
06fa294b
...
@@ -179,7 +179,7 @@ object RestApiHelper {
...
@@ -179,7 +179,7 @@ object RestApiHelper {
var
restApiUrl
:
String
?
=
null
var
restApiUrl
:
String
?
=
null
when
(
roomType
)
{
when
(
roomType
)
{
Room
.
TYPE_CHANNEL
->
restApiUrl
=
"/api/v1/channels.messages"
Room
.
TYPE_CHANNEL
->
restApiUrl
=
"/api/v1/channels.messages"
Room
.
TYPE_
PRIVATE
->
restApiUrl
=
"/api/v1/groups.messages"
Room
.
TYPE_
GROUP
->
restApiUrl
=
"/api/v1/groups.messages"
Room
.
TYPE_DIRECT_MESSAGE
->
restApiUrl
=
"/api/v1/dm.messages"
Room
.
TYPE_DIRECT_MESSAGE
->
restApiUrl
=
"/api/v1/dm.messages"
}
}
return
restApiUrl
return
restApiUrl
...
@@ -195,7 +195,7 @@ object RestApiHelper {
...
@@ -195,7 +195,7 @@ object RestApiHelper {
var
restApiUrl
:
String
?
=
null
var
restApiUrl
:
String
?
=
null
when
(
roomType
)
{
when
(
roomType
)
{
Room
.
TYPE_CHANNEL
->
restApiUrl
=
"/api/v1/channels.files"
Room
.
TYPE_CHANNEL
->
restApiUrl
=
"/api/v1/channels.files"
Room
.
TYPE_
PRIVATE
->
restApiUrl
=
"/api/v1/groups.files"
Room
.
TYPE_
GROUP
->
restApiUrl
=
"/api/v1/groups.files"
Room
.
TYPE_DIRECT_MESSAGE
->
restApiUrl
=
"/api/v1/dm.files"
Room
.
TYPE_DIRECT_MESSAGE
->
restApiUrl
=
"/api/v1/dm.files"
}
}
return
restApiUrl
return
restApiUrl
...
@@ -211,7 +211,7 @@ object RestApiHelper {
...
@@ -211,7 +211,7 @@ object RestApiHelper {
var
restApiUrl
:
String
?
=
null
var
restApiUrl
:
String
?
=
null
when
(
roomType
)
{
when
(
roomType
)
{
Room
.
TYPE_CHANNEL
->
restApiUrl
=
"/api/v1/channels.members"
Room
.
TYPE_CHANNEL
->
restApiUrl
=
"/api/v1/channels.members"
Room
.
TYPE_
PRIVATE
->
restApiUrl
=
"/api/v1/groups.members"
Room
.
TYPE_
GROUP
->
restApiUrl
=
"/api/v1/groups.members"
Room
.
TYPE_DIRECT_MESSAGE
->
restApiUrl
=
"/api/v1/dm.members"
Room
.
TYPE_DIRECT_MESSAGE
->
restApiUrl
=
"/api/v1/dm.members"
}
}
return
restApiUrl
return
restApiUrl
...
...
app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/ChannelRoomListHeader.java
View file @
06fa294b
...
@@ -23,14 +23,14 @@ public class ChannelRoomListHeader implements RoomListHeader {
...
@@ -23,14 +23,14 @@ public class ChannelRoomListHeader implements RoomListHeader {
@Override
@Override
public
boolean
owns
(
RoomSidebar
roomSidebar
)
{
public
boolean
owns
(
RoomSidebar
roomSidebar
)
{
return
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_CHANNEL
)
||
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_
PRIVATE
);
return
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_CHANNEL
)
||
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_
GROUP
);
}
}
@Override
@Override
public
boolean
shouldShow
(
@NonNull
List
<
RoomSidebar
>
roomSidebarList
)
{
public
boolean
shouldShow
(
@NonNull
List
<
RoomSidebar
>
roomSidebarList
)
{
for
(
RoomSidebar
roomSidebar:
roomSidebarList
)
{
for
(
RoomSidebar
roomSidebar:
roomSidebarList
)
{
if
((
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_CHANNEL
)
if
((
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_CHANNEL
)
||
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_
PRIVATE
))
||
roomSidebar
.
getType
().
equals
(
Room
.
TYPE_
GROUP
))
&&
!
roomSidebar
.
isAlert
()
&&
!
roomSidebar
.
isAlert
()
&&
!
roomSidebar
.
isFavorite
())
{
&&
!
roomSidebar
.
isFavorite
())
{
return
true
;
return
true
;
...
...
app/src/main/java/chat/rocket/android/layouthelper/chatroom/roomlist/RoomListItemViewHolder.java
View file @
06fa294b
...
@@ -93,7 +93,7 @@ public class RoomListItemViewHolder extends RecyclerView.ViewHolder {
...
@@ -93,7 +93,7 @@ public class RoomListItemViewHolder extends RecyclerView.ViewHolder {
case
Room
.
TYPE_CHANNEL
:
case
Room
.
TYPE_CHANNEL
:
itemView
.
showPublicChannelIcon
();
itemView
.
showPublicChannelIcon
();
break
;
break
;
case
Room
.
TYPE_
PRIVATE
:
case
Room
.
TYPE_
GROUP
:
itemView
.
showPrivateChannelIcon
();
itemView
.
showPrivateChannelIcon
();
break
;
break
;
case
Room
.
TYPE_LIVECHAT
:
case
Room
.
TYPE_LIVECHAT
:
...
...
app/src/test/kotlin/chat/rocket/android/api/rest/RestApiHelperTest.kt
View file @
06fa294b
This diff is collapsed.
Click to expand it.
rocket-chat-core/src/main/java/chat/rocket/core/models/Room.java
View file @
06fa294b
...
@@ -6,7 +6,7 @@ import com.google.auto.value.AutoValue;
...
@@ -6,7 +6,7 @@ import com.google.auto.value.AutoValue;
public
abstract
class
Room
{
public
abstract
class
Room
{
public
static
final
String
TYPE_CHANNEL
=
"c"
;
public
static
final
String
TYPE_CHANNEL
=
"c"
;
public
static
final
String
TYPE_
PRIVATE
=
"p"
;
public
static
final
String
TYPE_
GROUP
=
"p"
;
public
static
final
String
TYPE_DIRECT_MESSAGE
=
"d"
;
public
static
final
String
TYPE_DIRECT_MESSAGE
=
"d"
;
public
static
final
String
TYPE_LIVECHAT
=
"l"
;
public
static
final
String
TYPE_LIVECHAT
=
"l"
;
...
@@ -35,7 +35,7 @@ public abstract class Room {
...
@@ -35,7 +35,7 @@ public abstract class Room {
}
}
public
boolean
isPrivate
()
{
public
boolean
isPrivate
()
{
return
TYPE_
PRIVATE
.
equals
(
getType
());
return
TYPE_
GROUP
.
equals
(
getType
());
}
}
public
boolean
isDirectMessage
()
{
public
boolean
isDirectMessage
()
{
...
...
rocket-chat-core/src/main/java/chat/rocket/core/models/RoomSidebar.kt
View file @
06fa294b
...
@@ -2,9 +2,10 @@ package chat.rocket.core.models
...
@@ -2,9 +2,10 @@ package chat.rocket.core.models
class
RoomSidebar
{
class
RoomSidebar
{
lateinit
var
id
:
String
lateinit
var
id
:
String
lateinit
var
roomId
:
String
lateinit
var
roomName
:
String
lateinit
var
roomName
:
String
lateinit
var
type
:
String
lateinit
var
roomId
:
String
var
type
:
String
?
=
null
get
()
=
RoomType
.
get
(
field
)
?:
Room
.
TYPE_GROUP
var
userStatus
:
String
?
=
null
var
userStatus
:
String
?
=
null
var
isAlert
:
Boolean
=
false
var
isAlert
:
Boolean
=
false
var
isFavorite
:
Boolean
=
false
var
isFavorite
:
Boolean
=
false
...
...
rocket-chat-core/src/main/java/chat/rocket/core/models/RoomType.java
0 → 100644
View file @
06fa294b
package
chat
.
rocket
.
core
.
models
;
import
org.jetbrains.annotations.Nullable
;
public
enum
RoomType
{
CHANNEL
(
"c"
),
GROUP
(
"p"
),
DIRECT_MESSAGE
(
"d"
),
LIVECHAT
(
"l"
)
;
private
final
String
type
;
RoomType
(
String
type
)
{
this
.
type
=
type
;
}
@Nullable
public
static
String
get
(
@Nullable
String
type
)
{
for
(
RoomType
roomType
:
RoomType
.
values
())
{
if
(
roomType
.
type
.
equals
(
type
))
{
return
roomType
.
type
;
}
}
return
null
;
}
}
rocket-chat-core/src/main/java/chat/rocket/core/models/SpotlightRoom.java
View file @
06fa294b
...
@@ -16,7 +16,7 @@ public abstract class SpotlightRoom {
...
@@ -16,7 +16,7 @@ public abstract class SpotlightRoom {
}
}
public
boolean
isPrivate
()
{
public
boolean
isPrivate
()
{
return
Room
.
TYPE_
PRIVATE
.
equals
(
getType
());
return
Room
.
TYPE_
GROUP
.
equals
(
getType
());
}
}
public
boolean
isDirectMessage
()
{
public
boolean
isDirectMessage
()
{
...
...
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