aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff options
context:
space:
mode:
authorAndreas Straub <andy@strb.org>2015-06-26 15:41:02 +0200
committerAndreas Straub <andy@strb.org>2015-07-05 17:26:29 +0200
commit0423852cb8a3c22978aed3c5b88d18de5797010e (patch)
tree7617c67ea0305165030b7072924c3323efb8acdb /src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
parente8e126f2ce815165c27d27331690c488e48d0231 (diff)
Reformat code to use tabs
This really sucks to do it like this. Sorry. :(
Diffstat (limited to '')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/ConversationActivity.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 41a8cda6..f7dca7a3 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -755,16 +755,16 @@ public class ConversationActivity extends XmppActivity
}
break;
case R.id.encryption_choice_axolotl:
- Log.d(Config.LOGTAG, "Trying to enable axolotl...");
+ Log.d(Config.LOGTAG, "Trying to enable axolotl...");
if(conversation.getAccount().getAxolotlService().isContactAxolotlCapable(conversation.getContact())) {
- Log.d(Config.LOGTAG, "Enabled axolotl for Contact " + conversation.getContact().getJid() );
+ Log.d(Config.LOGTAG, "Enabled axolotl for Contact " + conversation.getContact().getJid() );
conversation.setNextEncryption(Message.ENCRYPTION_AXOLOTL);
item.setChecked(true);
} else {
- Log.d(Config.LOGTAG, "Contact " + conversation.getContact().getJid() + " not axolotl capable!");
+ Log.d(Config.LOGTAG, "Contact " + conversation.getContact().getJid() + " not axolotl capable!");
showAxolotlNoSessionsDialog();
}
- break;
+ break;
default:
conversation.setNextEncryption(Message.ENCRYPTION_NONE);
break;
@@ -798,7 +798,7 @@ public class ConversationActivity extends XmppActivity
.setChecked(true);
break;
case Message.ENCRYPTION_AXOLOTL:
- Log.d(Config.LOGTAG, "Axolotl confirmed. Setting menu item checked!");
+ Log.d(Config.LOGTAG, "Axolotl confirmed. Setting menu item checked!");
popup.getMenu().findItem(R.id.encryption_choice_axolotl)
.setChecked(true);
break;