archive/conversations
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes FS#48 and FS#136

Browse source 
- corrected preference "confirm_messages" to "confirm_messages_list"
- removed unused "heart message" garbage
This commit is contained in:
lookshe 2016-02-28 18:40:20 +01:00
parent bad1569136
commit 8fb6204288
5 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/de/thedevstack/conversationsplus/ConversationsPlusPreferences.java
View file

@ -168,9 +168,6 @@ public class ConversationsPlusPreferences extends Settings {
public static boolean forceEncryption() {
return getBoolean("force_encryption", false);
}
public static boolean confirmMessages() {
return getBoolean("confirm_messages", true);
}
public static boolean dontSaveEncrypted() {
return getBoolean("dont_save_encrypted", false);

3
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -3,6 +3,7 @@ package eu.siacs.conversations.parser;
import android.util.Log;
import android.util.Pair;
import de.tzur.conversations.Settings;
import eu.siacs.conversations.crypto.PgpDecryptionService;
import net.java.otr4j.session.Session;
import net.java.otr4j.session.SessionStatus;
@ -427,7 +428,7 @@ public class MessageParser extends AbstractParser implements
mXmppConnectionService.updateConversationUi();
}
if (ConversationsPlusPreferences.confirmMessages() && remoteMsgId != null && !isForwarded && !isTypeGroupChat) {
if (Settings.CONFIRM_MESSAGE_READ && remoteMsgId != null && !isForwarded && !isTypeGroupChat) {
sendMessageReceipts(account, packet);
}

2
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
View file

@ -163,7 +163,7 @@ public class SettingsActivity extends XmppActivity implements
}
} else if (name.equals("keep_foreground_service")) {
xmppConnectionService.toggleForegroundService();
} else if (name.equals("confirm_messages")
} else if (name.equals("confirm_messages_list")
|| name.equals("xa_on_silent_mode")
|| name.equals("away_when_screen_off")) {
if (xmppConnectionServiceBound) {

13
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
View file

@ -263,19 +263,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
viewHolder.messageBody.setTextIsSelectable(false);
}
private void displayHeartMessage(final ViewHolder viewHolder, final String body) {
if (viewHolder.download_button != null) {
viewHolder.download_button.setVisibility(View.GONE);
}
viewHolder.image.setVisibility(View.GONE);
viewHolder.messageBody.setVisibility(View.VISIBLE);
viewHolder.messageBody.setIncludeFontPadding(false);
Spannable span = new SpannableString(body);
span.setSpan(new RelativeSizeSpan(4.0f), 0, body.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
span.setSpan(new ForegroundColorSpan(activity.getWarningTextColor()), 0, body.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
viewHolder.messageBody.setText(span);
}
private void displayTextMessage(final ViewHolder viewHolder, final Message message, boolean darkBackground) {
if (viewHolder.download_button != null) {
viewHolder.download_button.setVisibility(View.GONE);

6
src/main/java/eu/siacs/conversations/utils/UIHelper.java
View file

@ -23,12 +23,6 @@ import eu.siacs.conversations.xmpp.jid.Jid;
public class UIHelper {
private static String BLACK_HEART_SUIT = "\u2665";
private static String HEAVY_BLACK_HEART_SUIT = "\u2764";
private static String WHITE_HEART_SUIT = "\u2661";
public static final ArrayList<String> HEARTS = new ArrayList<>(Arrays.asList(BLACK_HEART_SUIT,HEAVY_BLACK_HEART_SUIT,WHITE_HEART_SUIT));
private static final ArrayList<String> LOCATION_QUESTIONS = new ArrayList<>(Arrays.asList(
"where are you", //en
"where are you now", //en