Commit ccccd253 authored by Grigory Fedorov's avatar Grigory Fedorov

extension/muc: light code formatting and refactoring.

parent 743096a8
...@@ -91,8 +91,9 @@ public class Occupant implements Comparable<Occupant> { ...@@ -91,8 +91,9 @@ public class Occupant implements Comparable<Occupant> {
@Override @Override
public int compareTo(Occupant another) { public int compareTo(Occupant another) {
int result = another.role.ordinal() - role.ordinal(); int result = another.role.ordinal() - role.ordinal();
if (result != 0) if (result != 0) {
return result; return result;
}
return nickname.compareTo(another.nickname); return nickname.compareTo(another.nickname);
} }
......
...@@ -22,8 +22,7 @@ import com.xabber.android.data.entity.BaseEntity; ...@@ -22,8 +22,7 @@ import com.xabber.android.data.entity.BaseEntity;
import com.xabber.android.data.notification.EntityNotificationItem; import com.xabber.android.data.notification.EntityNotificationItem;
import com.xabber.android.ui.ConferenceAdd; import com.xabber.android.ui.ConferenceAdd;
public class RoomAuthorizationError extends BaseEntity implements public class RoomAuthorizationError extends BaseEntity implements EntityNotificationItem {
EntityNotificationItem {
public RoomAuthorizationError(String account, String user) { public RoomAuthorizationError(String account, String user) {
super(account, user); super(account, user);
...@@ -31,8 +30,7 @@ public class RoomAuthorizationError extends BaseEntity implements ...@@ -31,8 +30,7 @@ public class RoomAuthorizationError extends BaseEntity implements
@Override @Override
public Intent getIntent() { public Intent getIntent() {
return ConferenceAdd.createIntent(Application.getInstance(), return ConferenceAdd.createIntent(Application.getInstance(), account, user);
account, user);
} }
@Override @Override
...@@ -42,8 +40,7 @@ public class RoomAuthorizationError extends BaseEntity implements ...@@ -42,8 +40,7 @@ public class RoomAuthorizationError extends BaseEntity implements
@Override @Override
public String getText() { public String getText() {
return Application.getInstance().getString( return Application.getInstance().getString(R.string.AUTHENTICATION_FAILED);
R.string.AUTHENTICATION_FAILED);
} }
} }
...@@ -46,8 +46,7 @@ public class RoomInvite extends BaseEntity implements EntityNotificationItem { ...@@ -46,8 +46,7 @@ public class RoomInvite extends BaseEntity implements EntityNotificationItem {
*/ */
private final String password; private final String password;
public RoomInvite(String account, String user, String inviter, public RoomInvite(String account, String user, String inviter, String reason, String password) {
String reason, String password) {
super(account, user); super(account, user);
this.inviter = inviter; this.inviter = inviter;
this.reason = reason == null ? "" : reason; this.reason = reason == null ? "" : reason;
...@@ -73,18 +72,17 @@ public class RoomInvite extends BaseEntity implements EntityNotificationItem { ...@@ -73,18 +72,17 @@ public class RoomInvite extends BaseEntity implements EntityNotificationItem {
* @return Text for the confirmation. * @return Text for the confirmation.
*/ */
public String getConfirmation() { public String getConfirmation() {
String accountName = AccountManager.getInstance().getVerboseName( String accountName = AccountManager.getInstance().getVerboseName(account);
account); String inviterName = RosterManager.getInstance().getName(account, inviter);
String inviterName = RosterManager.getInstance().getName(account, if (reason == null || "".equals(reason)) {
inviter);
if (reason == null || "".equals(reason))
return Application.getInstance() return Application.getInstance()
.getString(R.string.muc_invite_confirm, accountName, .getString(R.string.muc_invite_confirm, accountName,
inviterName, user); inviterName, user);
else } else {
return Application.getInstance().getString( return Application.getInstance().getString(
R.string.muc_invite_confirm_reason, accountName, R.string.muc_invite_confirm_reason, accountName,
inviterName, user, reason); inviterName, user, reason);
}
} }
public String getInviter() { public String getInviter() {
......
...@@ -62,29 +62,40 @@ public enum RoomState { ...@@ -62,29 +62,40 @@ public enum RoomState {
* @return Status mode used in contact list. * @return Status mode used in contact list.
*/ */
StatusMode toStatusMode() { StatusMode toStatusMode() {
if (this == RoomState.available) switch (this) {
return StatusMode.available; case available:
else if (this == RoomState.occupation) return StatusMode.available;
return StatusMode.connection; case occupation:
else if (this == RoomState.joining) case joining:
return StatusMode.connection; case creating:
else if (this == RoomState.creating) case waiting:
return StatusMode.connection; return StatusMode.connection;
else if (this == RoomState.unavailable) case unavailable:
return StatusMode.unavailable; return StatusMode.unavailable;
else if (this == RoomState.waiting) case error:
return StatusMode.connection; return StatusMode.unsubscribed;
else if (this == RoomState.error) default:
return StatusMode.unsubscribed; throw new IllegalStateException();
else }
throw new IllegalStateException();
} }
/** /**
* @return Connected is establish or connection is in progress. * @return Connected is establish or connection is in progress.
*/ */
boolean inUse() { boolean inUse() {
return this == RoomState.available || this == RoomState.occupation switch (this) {
|| this == RoomState.creating || this == RoomState.joining;
case available:
case occupation:
case joining:
case creating:
return true;
case unavailable:
case waiting:
case error:
default:
return false;
}
} }
} }
...@@ -56,9 +56,8 @@ class RoomTable extends AbstractAccountTable { ...@@ -56,9 +56,8 @@ class RoomTable extends AbstractAccountTable {
} }
private static final String NAME = "rooms"; private static final String NAME = "rooms";
private static final String[] PROJECTION = new String[]{Fields._ID, private static final String[] PROJECTION = new String[]{ Fields._ID,
Fields.ACCOUNT, Fields.ROOM, Fields.NICKNAME, Fields.PASSWORD, Fields.ACCOUNT, Fields.ROOM, Fields.NICKNAME, Fields.PASSWORD, Fields.NEED_JOIN };
Fields.NEED_JOIN,};
private final DatabaseManager databaseManager; private final DatabaseManager databaseManager;
private SQLiteStatement writeStatement; private SQLiteStatement writeStatement;
...@@ -123,20 +122,12 @@ class RoomTable extends AbstractAccountTable { ...@@ -123,20 +122,12 @@ class RoomTable extends AbstractAccountTable {
/** /**
* Adds or updates room. * Adds or updates room.
*
* @param account
* @param room
* @param nickname
* @param password
* @param join
*/ */
void write(String account, String room, String nickname, String password, void write(String account, String room, String nickname, String password, boolean join) {
boolean join) {
synchronized (writeLock) { synchronized (writeLock) {
if (writeStatement == null) { if (writeStatement == null) {
SQLiteDatabase db = databaseManager.getWritableDatabase(); SQLiteDatabase db = databaseManager.getWritableDatabase();
writeStatement = db writeStatement = db.compileStatement("INSERT OR REPLACE INTO " + NAME
.compileStatement("INSERT OR REPLACE INTO " + NAME
+ " (" + Fields.ACCOUNT + ", " + Fields.ROOM + " (" + Fields.ACCOUNT + ", " + Fields.ROOM
+ ", " + Fields.NICKNAME + ", " + ", " + Fields.NICKNAME + ", "
+ Fields.PASSWORD + ", " + Fields.NEED_JOIN + Fields.PASSWORD + ", " + Fields.NEED_JOIN
...@@ -153,14 +144,10 @@ class RoomTable extends AbstractAccountTable { ...@@ -153,14 +144,10 @@ class RoomTable extends AbstractAccountTable {
/** /**
* Removes room. * Removes room.
*
* @param account
* @param room
*/ */
void remove(String account, String room) { void remove(String account, String room) {
SQLiteDatabase db = databaseManager.getWritableDatabase(); SQLiteDatabase db = databaseManager.getWritableDatabase();
db.delete(NAME, Fields.ACCOUNT + " = ? AND " + Fields.ROOM + " = ?", db.delete(NAME, Fields.ACCOUNT + " = ? AND " + Fields.ROOM + " = ?", new String[]{account, room});
new String[]{account, room});
} }
@Override @Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment