thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

save muc subject to disk and use crypto targets for offline name generation

Browse source
This commit is contained in:
Christian Schneppe 2017-12-27 21:01:13 +01:00
parent 044bc0e95d
commit 7542322a40
4 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/main/java/de/pixart/messenger/entities/Conversation.java
View file

@ -509,12 +509,13 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
public String getName() {
if (getMode() == MODE_MULTI) {
if (getMucOptions().getSubject() != null) {
return getMucOptions().getSubject();
} else if (bookmark != null
&& bookmark.getBookmarkName() != null
&& !bookmark.getBookmarkName().trim().isEmpty()) {
return bookmark.getBookmarkName().trim();
final String subject = getMucOptions().getSubject();
final String bookmarkName = bookmark != null ? bookmark.getBookmarkName() : null;
if (subject != null && !subject.trim().isEmpty()) {
return subject;
} else if (bookmarkName != null && !bookmarkName.trim().isEmpty()) {
return bookmarkName;
} else {
String generatedName = getMucOptions().createNameFromParticipants();
if (generatedName != null) {

34
src/main/java/de/pixart/messenger/entities/MucOptions.java
View file

@ -361,12 +361,11 @@ public class MucOptions {
private final Set<User> users = new HashSet<>();
private final List<String> features = new ArrayList<>();
private Data form = new Data();
private Conversation conversation;
private final Conversation conversation;
private boolean isOnline = false;
private Error error = Error.NONE;
public OnRenameListener onRenameListener = null;
private User self;
private String subject = null;
private String password = null;
public MucOptions(Conversation conversation) {
@ -660,15 +659,37 @@ public class MucOptions {
return self;
}
public void setSubject(String content) {
this.subject = content;
public boolean setSubject(String subject) {
return this.conversation.setAttribute("subject", subject);
}
public String getSubject() {
return this.subject;
return this.conversation.getAttribute("subject");
}
public List<User> getFallbackUsersFromCryptoTargets() {
List<User> users = new ArrayList<>();
for (Jid jid : conversation.getAcceptedCryptoTargets()) {
User user = new User(this, null);
user.setRealJid(jid);
users.add(user);
}
return users;
}
public List<User> getUsersRelevantForNameAndAvatar() {
final List<User> users;
if (isOnline) {
users = getUsers(5);
} else {
users = getFallbackUsersFromCryptoTargets();
}
return users;
}
public int NumberOfUsers() {
List<User> users = getUsersRelevantForNameAndAvatar();
if (users.size() >= 1) {
return users.size();
} else {
@ -679,9 +700,10 @@ public class MucOptions {
public String createNameFromParticipants() {
List<User> users = getUsersRelevantForNameAndAvatar();
if (users.size() >= 1) {
StringBuilder builder = new StringBuilder();
for (User user : getUsers(5)) {
for (User user : users) {
if (builder.length() != 0) {
builder.append(", ");
}

4
src/main/java/de/pixart/messenger/parser/MessageParser.java
View file

@ -661,7 +661,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) {
conversation.setHasMessagesLeftOnServer(conversation.countMessages() > 0);
String subject = packet.findChildContent("subject");
conversation.getMucOptions().setSubject(subject);
if (conversation.getMucOptions().setSubject(subject)) {
mXmppConnectionService.updateConversation(conversation);
}
final Bookmark bookmark = conversation.getBookmark();
if (bookmark != null && bookmark.getBookmarkName() == null) {
if (bookmark.setBookmarkName(subject)) {

2
src/main/java/de/pixart/messenger/services/AvatarService.java
View file

@ -217,7 +217,7 @@ public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
if (bitmap != null || cachedOnly) {
return bitmap;
}
final List<MucOptions.User> users = mucOptions.getUsers(5);
final List<MucOptions.User> users = mucOptions.getUsersRelevantForNameAndAvatar();
if (users.size() == 0) {
Conversation c = mucOptions.getConversation();
bitmap = getImpl(c.getName(), c.getJid().toBareJid().toString(), size);