From c8683aeccde5abf99bc78721c9020e833c7f5cde Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 17 Nov 2014 04:09:52 +0000
Subject: [PATCH] Action bar title fixes

---
 .../main/java/i2p/bote/android/EmailListActivity.java  | 10 ++--------
 .../main/java/i2p/bote/android/ViewEmailActivity.java  |  1 +
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/i2p/bote/android/EmailListActivity.java b/app/src/main/java/i2p/bote/android/EmailListActivity.java
index 9dc692a..b32da10 100644
--- a/app/src/main/java/i2p/bote/android/EmailListActivity.java
+++ b/app/src/main/java/i2p/bote/android/EmailListActivity.java
@@ -51,8 +51,6 @@ public class EmailListActivity extends ActionBarActivity implements
     private I2PAndroidHelper mHelper;
     private RouterChoice mRouterChoice;
 
-    private CharSequence mDrawerTitle;
-    private CharSequence mTitle;
     private SharedPreferences mSharedPrefs;
 
     /**
@@ -90,7 +88,6 @@ public class EmailListActivity extends ActionBarActivity implements
 
         // Initialize variables
         mHelper = new I2PAndroidHelper(this);
-        mTitle = mDrawerTitle = getTitle();
         mSharedPrefs = getSharedPreferences(SHARED_PREFS, 0);
         mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
         mDrawerOuter = (RelativeLayout) findViewById(R.id.drawer_outer);
@@ -130,7 +127,6 @@ public class EmailListActivity extends ActionBarActivity implements
                 // Don't mark as opened if the user closed by dragging
                 // but uses the action bar icon to open
                 wasDragged = false;
-                getSupportActionBar().setTitle(mTitle);
                 supportInvalidateOptionsMenu();
             }
 
@@ -139,9 +135,8 @@ public class EmailListActivity extends ActionBarActivity implements
                 if (wasDragged && !mSharedPrefs.getBoolean(PREF_NAV_DRAWER_OPENED, false)) {
                     SharedPreferences.Editor edit = mSharedPrefs.edit();
                     edit.putBoolean(PREF_NAV_DRAWER_OPENED, true);
-                    edit.commit();
+                    edit.apply();
                 }
-                getSupportActionBar().setTitle(mDrawerTitle);
                 supportInvalidateOptionsMenu();
             }
 
@@ -362,8 +357,7 @@ public class EmailListActivity extends ActionBarActivity implements
 
     @Override
     public void setTitle(CharSequence title) {
-        mTitle = title;
-        getSupportActionBar().setTitle(mTitle);
+        getSupportActionBar().setTitle(title);
     }
 
     @Override
diff --git a/app/src/main/java/i2p/bote/android/ViewEmailActivity.java b/app/src/main/java/i2p/bote/android/ViewEmailActivity.java
index 3f0fdc2..aa9a80e 100644
--- a/app/src/main/java/i2p/bote/android/ViewEmailActivity.java
+++ b/app/src/main/java/i2p/bote/android/ViewEmailActivity.java
@@ -50,6 +50,7 @@ public class ViewEmailActivity extends ActionBarActivity implements
 
         // Enable ActionBar app icon to behave as action to go back
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
 
         Intent i = getIntent();
         String folderName = i.getStringExtra(FOLDER_NAME);