From 7cc71094dae503863a3e75bc60da4418e81e193d Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Wed, 24 Oct 2018 20:49:34 +0200
Subject: do not provide up navigation in publish account when in setup mode

---
 .../de/pixart/messenger/ui/PublishProfilePictureActivity.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java')

diff --git a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
index a6f158646..9d6df3980 100644
--- a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
@@ -77,7 +77,6 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_publish_profile_picture);
         setSupportActionBar(findViewById(R.id.toolbar));
-        configureActionBar(getSupportActionBar());
 
         this.avatar = findViewById(R.id.account_image);
         this.cancelButton = findViewById(R.id.cancel_button);
@@ -158,12 +157,13 @@ public class PublishProfilePictureActivity extends XmppActivity implements XmppC
     @Override
     protected void onStart() {
         super.onStart();
-        if (getIntent() != null) {
-            this.mInitialAccountSetup = getIntent().getBooleanExtra("setup", false);
-        }
+        final Intent intent = getIntent();
+        this.mInitialAccountSetup = intent != null && intent.getBooleanExtra("setup", false);
+
         if (this.mInitialAccountSetup) {
             this.cancelButton.setText(R.string.skip);
         }
+        configureActionBar(getSupportActionBar(), !this.mInitialAccountSetup);
     }
 
     protected void loadImageIntoPreview(Uri uri) {
-- 
cgit v1.2.3