aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-06-07 15:22:51 +0200
committersteckbrief <steckbrief@chefmail.de>2016-06-07 15:22:51 +0200
commitf7d2e1560377b36d3730922a2fadaee05a570b49 (patch)
tree1c99bd75d863d82a82495fabe434892ee76b9842 /src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java
parentc5c5b417ddd66b4611b0493c0e0a8349adbd34a4 (diff)
Related to FS#140, Logo implementation moved to FloatingActionButton
- Appcompat v7 dependency added - References adjusted to work correctly with appcompat v7
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java
index 4f1c9fc7..d1d74d5f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/VerifyOTRActivity.java
@@ -255,27 +255,20 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
protected void updateView() {
if (this.mConversation.hasValidOtrSession()) {
- final ActionBar actionBar = getActionBar();
this.mVerificationExplain.setText(R.string.no_otr_session_found);
invalidateOptionsMenu();
switch(this.mode) {
case MODE_ASK_QUESTION:
- if (actionBar != null ) {
- actionBar.setTitle(R.string.ask_question);
- }
+ this.setActionBarTitle(R.string.ask_question);
this.updateViewAskQuestion();
break;
case MODE_ANSWER_QUESTION:
- if (actionBar != null ) {
- actionBar.setTitle(R.string.smp_requested);
- }
+ this.setActionBarTitle(R.string.smp_requested);
this.updateViewAnswerQuestion();
break;
case MODE_MANUAL_VERIFICATION:
default:
- if (actionBar != null ) {
- actionBar.setTitle(R.string.manually_verify);
- }
+ this.setActionBarTitle(R.string.manually_verify);
this.updateViewManualVerification();
break;
}