Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-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
xabber-android
Commits
ccccd253
Commit
ccccd253
authored
Jul 01, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
extension/muc: light code formatting and refactoring.
parent
743096a8
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
178 additions
and
222 deletions
+178
-222
MUCManager.java
...ava/com/xabber/android/data/extension/muc/MUCManager.java
+69
-96
Occupant.java
.../java/com/xabber/android/data/extension/muc/Occupant.java
+2
-1
RoomAuthorizationError.java
...er/android/data/extension/muc/RoomAuthorizationError.java
+3
-6
RoomChat.java
.../java/com/xabber/android/data/extension/muc/RoomChat.java
+64
-75
RoomInvite.java
...ava/com/xabber/android/data/extension/muc/RoomInvite.java
+6
-8
RoomState.java
...java/com/xabber/android/data/extension/muc/RoomState.java
+29
-18
RoomTable.java
...java/com/xabber/android/data/extension/muc/RoomTable.java
+5
-18
No files found.
app/src/main/java/com/xabber/android/data/extension/muc/MUCManager.java
View file @
ccccd253
This diff is collapsed.
Click to expand it.
app/src/main/java/com/xabber/android/data/extension/muc/Occupant.java
View file @
ccccd253
...
...
@@ -91,8 +91,9 @@ public class Occupant implements Comparable<Occupant> {
@Override
public
int
compareTo
(
Occupant
another
)
{
int
result
=
another
.
role
.
ordinal
()
-
role
.
ordinal
();
if
(
result
!=
0
)
if
(
result
!=
0
)
{
return
result
;
}
return
nickname
.
compareTo
(
another
.
nickname
);
}
...
...
app/src/main/java/com/xabber/android/data/extension/muc/RoomAuthorizationError.java
View file @
ccccd253
...
...
@@ -22,8 +22,7 @@ import com.xabber.android.data.entity.BaseEntity;
import
com.xabber.android.data.notification.EntityNotificationItem
;
import
com.xabber.android.ui.ConferenceAdd
;
public
class
RoomAuthorizationError
extends
BaseEntity
implements
EntityNotificationItem
{
public
class
RoomAuthorizationError
extends
BaseEntity
implements
EntityNotificationItem
{
public
RoomAuthorizationError
(
String
account
,
String
user
)
{
super
(
account
,
user
);
...
...
@@ -31,8 +30,7 @@ public class RoomAuthorizationError extends BaseEntity implements
@Override
public
Intent
getIntent
()
{
return
ConferenceAdd
.
createIntent
(
Application
.
getInstance
(),
account
,
user
);
return
ConferenceAdd
.
createIntent
(
Application
.
getInstance
(),
account
,
user
);
}
@Override
...
...
@@ -42,8 +40,7 @@ public class RoomAuthorizationError extends BaseEntity implements
@Override
public
String
getText
()
{
return
Application
.
getInstance
().
getString
(
R
.
string
.
AUTHENTICATION_FAILED
);
return
Application
.
getInstance
().
getString
(
R
.
string
.
AUTHENTICATION_FAILED
);
}
}
app/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
View file @
ccccd253
This diff is collapsed.
Click to expand it.
app/src/main/java/com/xabber/android/data/extension/muc/RoomInvite.java
View file @
ccccd253
...
...
@@ -46,8 +46,7 @@ public class RoomInvite extends BaseEntity implements EntityNotificationItem {
*/
private
final
String
password
;
public
RoomInvite
(
String
account
,
String
user
,
String
inviter
,
String
reason
,
String
password
)
{
public
RoomInvite
(
String
account
,
String
user
,
String
inviter
,
String
reason
,
String
password
)
{
super
(
account
,
user
);
this
.
inviter
=
inviter
;
this
.
reason
=
reason
==
null
?
""
:
reason
;
...
...
@@ -73,18 +72,17 @@ public class RoomInvite extends BaseEntity implements EntityNotificationItem {
* @return Text for the confirmation.
*/
public
String
getConfirmation
()
{
String
accountName
=
AccountManager
.
getInstance
().
getVerboseName
(
account
);
String
inviterName
=
RosterManager
.
getInstance
().
getName
(
account
,
inviter
);
if
(
reason
==
null
||
""
.
equals
(
reason
))
String
accountName
=
AccountManager
.
getInstance
().
getVerboseName
(
account
);
String
inviterName
=
RosterManager
.
getInstance
().
getName
(
account
,
inviter
);
if
(
reason
==
null
||
""
.
equals
(
reason
))
{
return
Application
.
getInstance
()
.
getString
(
R
.
string
.
muc_invite_confirm
,
accountName
,
inviterName
,
user
);
else
}
else
{
return
Application
.
getInstance
().
getString
(
R
.
string
.
muc_invite_confirm_reason
,
accountName
,
inviterName
,
user
,
reason
);
}
}
public
String
getInviter
()
{
...
...
app/src/main/java/com/xabber/android/data/extension/muc/RoomState.java
View file @
ccccd253
...
...
@@ -62,29 +62,40 @@ public enum RoomState {
* @return Status mode used in contact list.
*/
StatusMode
toStatusMode
()
{
if
(
this
==
RoomState
.
available
)
return
StatusMode
.
available
;
else
if
(
this
==
RoomState
.
occupation
)
return
StatusMode
.
connection
;
else
if
(
this
==
RoomState
.
joining
)
return
StatusMode
.
connection
;
else
if
(
this
==
RoomState
.
creating
)
return
StatusMode
.
connection
;
else
if
(
this
==
RoomState
.
unavailable
)
return
StatusMode
.
unavailable
;
else
if
(
this
==
RoomState
.
waiting
)
return
StatusMode
.
connection
;
else
if
(
this
==
RoomState
.
error
)
return
StatusMode
.
unsubscribed
;
else
throw
new
IllegalStateException
();
switch
(
this
)
{
case
available:
return
StatusMode
.
available
;
case
occupation:
case
joining:
case
creating:
case
waiting:
return
StatusMode
.
connection
;
case
unavailable:
return
StatusMode
.
unavailable
;
case
error:
return
StatusMode
.
unsubscribed
;
default
:
throw
new
IllegalStateException
();
}
}
/**
* @return Connected is establish or connection is in progress.
*/
boolean
inUse
()
{
return
this
==
RoomState
.
available
||
this
==
RoomState
.
occupation
||
this
==
RoomState
.
creating
||
this
==
RoomState
.
joining
;
switch
(
this
)
{
case
available:
case
occupation:
case
joining:
case
creating:
return
true
;
case
unavailable:
case
waiting:
case
error:
default
:
return
false
;
}
}
}
app/src/main/java/com/xabber/android/data/extension/muc/RoomTable.java
View file @
ccccd253
...
...
@@ -56,9 +56,8 @@ class RoomTable extends AbstractAccountTable {
}
private
static
final
String
NAME
=
"rooms"
;
private
static
final
String
[]
PROJECTION
=
new
String
[]{
Fields
.
_ID
,
Fields
.
ACCOUNT
,
Fields
.
ROOM
,
Fields
.
NICKNAME
,
Fields
.
PASSWORD
,
Fields
.
NEED_JOIN
,};
private
static
final
String
[]
PROJECTION
=
new
String
[]{
Fields
.
_ID
,
Fields
.
ACCOUNT
,
Fields
.
ROOM
,
Fields
.
NICKNAME
,
Fields
.
PASSWORD
,
Fields
.
NEED_JOIN
};
private
final
DatabaseManager
databaseManager
;
private
SQLiteStatement
writeStatement
;
...
...
@@ -123,20 +122,12 @@ class RoomTable extends AbstractAccountTable {
/**
* Adds or updates room.
*
* @param account
* @param room
* @param nickname
* @param password
* @param join
*/
void
write
(
String
account
,
String
room
,
String
nickname
,
String
password
,
boolean
join
)
{
void
write
(
String
account
,
String
room
,
String
nickname
,
String
password
,
boolean
join
)
{
synchronized
(
writeLock
)
{
if
(
writeStatement
==
null
)
{
SQLiteDatabase
db
=
databaseManager
.
getWritableDatabase
();
writeStatement
=
db
.
compileStatement
(
"INSERT OR REPLACE INTO "
+
NAME
writeStatement
=
db
.
compileStatement
(
"INSERT OR REPLACE INTO "
+
NAME
+
" ("
+
Fields
.
ACCOUNT
+
", "
+
Fields
.
ROOM
+
", "
+
Fields
.
NICKNAME
+
", "
+
Fields
.
PASSWORD
+
", "
+
Fields
.
NEED_JOIN
...
...
@@ -153,14 +144,10 @@ class RoomTable extends AbstractAccountTable {
/**
* Removes room.
*
* @param account
* @param room
*/
void
remove
(
String
account
,
String
room
)
{
SQLiteDatabase
db
=
databaseManager
.
getWritableDatabase
();
db
.
delete
(
NAME
,
Fields
.
ACCOUNT
+
" = ? AND "
+
Fields
.
ROOM
+
" = ?"
,
new
String
[]{
account
,
room
});
db
.
delete
(
NAME
,
Fields
.
ACCOUNT
+
" = ? AND "
+
Fields
.
ROOM
+
" = ?"
,
new
String
[]{
account
,
room
});
}
@Override
...
...
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