From 0dc6ec294b13609b8fb09cab0ebf9885e4df5aee Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Tue, 8 Apr 2014 13:14:40 -0700
Subject: [PATCH 1/2] use normal means to set actionbar icon

// FREEBIE
---
 res/values/styles.xml                         |  4 +++
 .../ApplicationPreferencesActivity.java       |  2 --
 .../securesms/ContactSelectionActivity.java   |  2 --
 .../securesms/ConversationActivity.java       |  2 --
 .../securesms/ConversationListActivity.java   |  3 +-
 .../securesms/GroupCreateActivity.java        |  3 +-
 .../securesms/ImportExportActivity.java       |  2 --
 .../securesms/LogSubmitActivity.java          | 19 ------------
 .../securesms/MmsPreferencesActivity.java     |  2 --
 .../securesms/NewConversationActivity.java    |  6 +---
 .../PushContactSelectionActivity.java         | 20 +-----------
 .../securesms/RegistrationActivity.java       |  6 +---
 .../RegistrationProgressActivity.java         |  3 +-
 .../securesms/ReviewIdentitiesActivity.java   |  2 --
 .../securesms/VerifyIdentityActivity.java     |  2 --
 .../securesms/util/ActionBarUtil.java         | 31 -------------------
 16 files changed, 10 insertions(+), 99 deletions(-)
 delete mode 100644 src/org/thoughtcrime/securesms/util/ActionBarUtil.java

diff --git a/res/values/styles.xml b/res/values/styles.xml
index 83185c98c0..c0f24f2fe7 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -21,6 +21,8 @@
            parent="@style/Widget.Sherlock.ActionBar">
         <item name="android:background">#ff111111</item>
         <item name="background">#ff111111</item>
+        <item name="android:icon">@drawable/actionbar_icon_holo_dark</item>
+        <item name="icon">@drawable/actionbar_icon_holo_dark</item>
     </style>
 
     <style name="TextSecure.TitleTextStyle" parent="TextAppearance.Sherlock.Widget.ActionBar.Title">
@@ -37,6 +39,8 @@
         <item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
         <item name="android:subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
         <item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
+        <item name="android:icon">@drawable/actionbar_icon_holo_light</item>
+        <item name="icon">@drawable/actionbar_icon_holo_light</item>
     </style>
 
 	<style name="transparent_progress">
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index f730571c97..c86cf5c63b 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -53,7 +53,6 @@ import org.thoughtcrime.securesms.contacts.ContactIdentityManager;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
 import org.thoughtcrime.securesms.service.KeyCachingService;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
@@ -101,7 +100,6 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
     super.onCreate(icicle);
 
     this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
 
     addPreferencesFromResource(R.xml.preferences);
 
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
index 6ba192173d..da3d4d5dc1 100644
--- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -30,7 +30,6 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
 import java.util.ArrayList;
@@ -61,7 +60,6 @@ public class ContactSelectionActivity extends PassphraseRequiredSherlockFragment
     super.onCreate(icicle);
 
     final ActionBar actionBar = this.getSupportActionBar();
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
     actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
     actionBar.setDisplayHomeAsUpEnabled(true);
 
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index ddaf32c6ca..577e91105b 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -87,7 +87,6 @@ import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
 import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.CharacterCalculator;
@@ -181,7 +180,6 @@ public class ConversationActivity extends PassphraseRequiredSherlockFragmentActi
 
     setContentView(R.layout.conversation_activity);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
 
     initializeReceivers();
     initializeResources();
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index a8598b04e2..4531d1a788 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -31,7 +31,6 @@ import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.service.SendReceiveService;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
@@ -64,7 +63,7 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
 
     setContentView(R.layout.conversation_list_activity);
 
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar(), R.string.app_name);
+    getSupportActionBar().setTitle(R.string.app_name);
 
     initializeNavigationDrawer();
     initializeSenderReceiverService();
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index 474faf7c9d..b37e03ca5d 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -55,7 +55,6 @@ import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
@@ -130,7 +129,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
 
     setContentView(R.layout.group_create_activity);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar(), R.string.GroupCreateActivity_actionbar_title);
+    getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_title);
 
     selectedContacts = new HashSet<Recipient>();
     initializeResources();
diff --git a/src/org/thoughtcrime/securesms/ImportExportActivity.java b/src/org/thoughtcrime/securesms/ImportExportActivity.java
index f91749861b..175d1d5741 100644
--- a/src/org/thoughtcrime/securesms/ImportExportActivity.java
+++ b/src/org/thoughtcrime/securesms/ImportExportActivity.java
@@ -10,7 +10,6 @@ import android.support.v4.view.ViewPager;
 import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.MenuItem;
 
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.whispersystems.textsecure.crypto.MasterSecret;
 
 
@@ -25,7 +24,6 @@ public class ImportExportActivity extends PassphraseRequiredSherlockFragmentActi
     super.onCreate(savedInstanceState);
     setContentView(R.layout.import_export_activity);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
 
     initializeResources();
     initializeViewPager();
diff --git a/src/org/thoughtcrime/securesms/LogSubmitActivity.java b/src/org/thoughtcrime/securesms/LogSubmitActivity.java
index 4063e44dae..7296762a63 100644
--- a/src/org/thoughtcrime/securesms/LogSubmitActivity.java
+++ b/src/org/thoughtcrime/securesms/LogSubmitActivity.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms;
 
 import android.app.AlertDialog;
-import android.app.ProgressDialog;
 import android.text.ClipboardManager;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
@@ -19,24 +18,10 @@ import com.actionbarsherlock.app.SherlockActivity;
 import com.actionbarsherlock.view.MenuItem;
 import com.google.thoughtcrimegson.Gson;
 import com.google.thoughtcrimegson.JsonIOException;
-import com.google.thoughtcrimegson.JsonParseException;
 import com.google.thoughtcrimegson.JsonSyntaxException;
 import com.google.thoughtcrimegson.reflect.TypeToken;
 
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.NameValuePair;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.util.EntityUtils;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
-import org.thoughtcrime.securesms.util.Util;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
@@ -45,12 +30,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Type;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -70,7 +52,6 @@ public class LogSubmitActivity extends SherlockActivity {
   protected void onCreate(Bundle icicle) {
     super.onCreate(icicle);
     setContentView(R.layout.log_submit_activity);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     initializeResources();
   }
diff --git a/src/org/thoughtcrime/securesms/MmsPreferencesActivity.java b/src/org/thoughtcrime/securesms/MmsPreferencesActivity.java
index b8e8d65545..db6dc555a2 100644
--- a/src/org/thoughtcrime/securesms/MmsPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/MmsPreferencesActivity.java
@@ -26,7 +26,6 @@ import android.widget.Toast;
 import com.actionbarsherlock.view.MenuItem;
 import org.thoughtcrime.securesms.mms.MmsDownloadHelper;
 import org.thoughtcrime.securesms.service.SendReceiveService;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
@@ -47,7 +46,6 @@ public class MmsPreferencesActivity extends PassphraseRequiredSherlockPreference
     super.onCreate(icicle);
 
     this.getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
     initializePreferences();
 
     masterSecret = getIntent().getParcelableExtra("master_secret");
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index 64bd8a9d9f..04ae7fecaf 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -20,7 +20,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
@@ -32,7 +31,6 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.NumberUtil;
@@ -65,9 +63,7 @@ public class NewConversationActivity extends PassphraseRequiredSherlockFragmentA
     dynamicTheme.onCreate(this);
     super.onCreate(icicle);
 
-    final ActionBar actionBar = this.getSupportActionBar();
-    ActionBarUtil.initializeDefaultActionBar(this, actionBar);
-    actionBar.setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
     setContentView(R.layout.new_conversation_activity);
     initializeResources();
diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
index e61281a899..bf04fef501 100644
--- a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
@@ -19,32 +19,16 @@ package org.thoughtcrime.securesms;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.View;
-import android.widget.Toast;
 
-import org.thoughtcrime.securesms.components.SingleRecipientPanel;
-import org.thoughtcrime.securesms.contacts.ContactAccessor;
-import org.thoughtcrime.securesms.database.DatabaseFactory;
-import org.thoughtcrime.securesms.database.ThreadDatabase;
-import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.recipients.RecipientFactory;
-import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
-import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.NumberUtil;
-import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.whispersystems.textsecure.crypto.MasterSecret;
 
-import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
 import static org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
@@ -68,9 +52,7 @@ public class PushContactSelectionActivity extends PassphraseRequiredSherlockFrag
     dynamicTheme.onCreate(this);
     super.onCreate(icicle);
 
-    final ActionBar actionBar = this.getSupportActionBar();
-    ActionBarUtil.initializeDefaultActionBar(this, actionBar);
-    actionBar.setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
     setContentView(R.layout.push_contact_selection_activity);
     initializeResources();
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 55cd3564a0..f1f3af99e6 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -1,11 +1,9 @@
 package org.thoughtcrime.securesms;
 
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.telephony.TelephonyManager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -17,7 +15,6 @@ import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.actionbarsherlock.app.ActionBar;
 import com.actionbarsherlock.app.SherlockActivity;
 import com.google.android.gcm.GCMRegistrar;
 import com.google.i18n.phonenumbers.AsYouTypeFormatter;
@@ -25,7 +22,6 @@ import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
 
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.whispersystems.textsecure.crypto.MasterSecret;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Dialogs;
@@ -58,7 +54,7 @@ public class RegistrationActivity extends SherlockActivity {
     super.onCreate(icicle);
     setContentView(R.layout.registration_activity);
 
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar(), getString(R.string.RegistrationActivity_connect_with_textsecure));
+    getSupportActionBar().setTitle(getString(R.string.RegistrationActivity_connect_with_textsecure));
 
     initializeResources();
     initializeSpinner();
diff --git a/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java b/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
index 67cea2798d..c66e574a71 100644
--- a/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
@@ -32,7 +32,6 @@ import com.actionbarsherlock.app.SherlockActivity;
 
 import org.thoughtcrime.securesms.push.PushServiceSocketFactory;
 import org.thoughtcrime.securesms.service.RegistrationService;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.Dialogs;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.textsecure.crypto.MasterSecret;
@@ -93,7 +92,7 @@ public class RegistrationProgressActivity extends SherlockActivity {
   @Override
   public void onCreate(Bundle bundle) {
     super.onCreate(bundle);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar(), getString(R.string.RegistrationProgressActivity_verifying_number));
+    getSupportActionBar().setTitle(getString(R.string.RegistrationProgressActivity_verifying_number));
     setContentView(R.layout.registration_progress_activity);
 
     initializeResources();
diff --git a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
index d9d7428329..ab4c885729 100644
--- a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
+++ b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
@@ -21,7 +21,6 @@ import android.os.Bundle;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
 
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
 public class ReviewIdentitiesActivity extends SherlockFragmentActivity {
@@ -34,7 +33,6 @@ public class ReviewIdentitiesActivity extends SherlockFragmentActivity {
     super.onCreate(bundle);
     setContentView(R.layout.review_identities);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index e2ff224034..3af573dd82 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -23,7 +23,6 @@ import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
 import org.whispersystems.textsecure.crypto.IdentityKey;
 import org.whispersystems.textsecure.crypto.MasterSecret;
@@ -50,7 +49,6 @@ public class VerifyIdentityActivity extends KeyScanningActivity {
   public void onCreate(Bundle state) {
     super.onCreate(state);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar());
     setContentView(R.layout.verify_identity_activity);
 
     initializeResources();
diff --git a/src/org/thoughtcrime/securesms/util/ActionBarUtil.java b/src/org/thoughtcrime/securesms/util/ActionBarUtil.java
deleted file mode 100644
index 571ab78212..0000000000
--- a/src/org/thoughtcrime/securesms/util/ActionBarUtil.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.thoughtcrime.securesms.util;
-
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.util.TypedValue;
-
-import com.actionbarsherlock.app.ActionBar;
-
-import org.thoughtcrime.securesms.R;
-
-public class ActionBarUtil {
-
-  public static void initializeDefaultActionBar(final Context c, final ActionBar actionBar, final int titleResId) {
-    actionBar.setTitle(titleResId);
-    initializeDefaultActionBar(c, actionBar);
-  }
-
-  public static void initializeDefaultActionBar(final Context c, final ActionBar actionBar, final String title) {
-    actionBar.setTitle(title);
-    initializeDefaultActionBar(c, actionBar);
-  }
-
-  public static void initializeDefaultActionBar(final Context c, final ActionBar actionBar) {
-    TypedValue iconResValue = new TypedValue();
-    c.getTheme().resolveAttribute(R.attr.actionbar_icon, iconResValue, true);
-    int attributeResourceId = iconResValue.resourceId;
-    Drawable icon = c.getResources().getDrawable(attributeResourceId);
-    actionBar.setIcon(icon);
-  }
-
-}

From 454673cd0c11273b9043343ff5b908df7f2b51bf Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Wed, 9 Apr 2014 13:26:06 -0700
Subject: [PATCH 2/2] Update ActionBar title on language change

Fixes #1329
// FREEBIE
---
 .../securesms/GroupCreateActivity.java         |  2 +-
 .../securesms/NewConversationActivity.java     |  9 +++++++--
 .../PushContactSelectionActivity.java          |  7 ++++++-
 .../securesms/ReviewIdentitiesActivity.java    |  9 +++++++--
 .../thoughtcrime/securesms/ShareActivity.java  | 11 +----------
 .../securesms/VerifyIdentityActivity.java      | 18 +++++++++++++++++-
 6 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index b37e03ca5d..ad1b09d456 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -129,7 +129,6 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
 
     setContentView(R.layout.group_create_activity);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-    getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_title);
 
     selectedContacts = new HashSet<Recipient>();
     initializeResources();
@@ -140,6 +139,7 @@ public class GroupCreateActivity extends PassphraseRequiredSherlockFragmentActiv
     super.onResume();
     dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
+    getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_title);
     if (!TextSecurePreferences.isPushRegistered(this)) {
       disableWhisperGroupUi(R.string.GroupCreateActivity_you_dont_support_push);
     }
diff --git a/src/org/thoughtcrime/securesms/NewConversationActivity.java b/src/org/thoughtcrime/securesms/NewConversationActivity.java
index 04ae7fecaf..8e11f4b2fc 100644
--- a/src/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -32,6 +32,7 @@ import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.RecipientFormattingException;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.DirectoryHelper;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.NumberUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -53,14 +54,16 @@ public class NewConversationActivity extends PassphraseRequiredSherlockFragmentA
   private final static String TAG                 = "ContactSelectActivity";
   public  final static String MASTER_SECRET_EXTRA = "master_secret";
 
-  private final DynamicTheme dynamicTheme = new DynamicTheme();
-  private       MasterSecret masterSecret;
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme   ();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+  private       MasterSecret    masterSecret;
 
   private PushContactSelectionListFragment contactsFragment;
 
   @Override
   protected void onCreate(Bundle icicle) {
     dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
     super.onCreate(icicle);
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -73,6 +76,8 @@ public class NewConversationActivity extends PassphraseRequiredSherlockFragmentA
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__select_contacts);
     masterSecret = getIntent().getParcelableExtra(MASTER_SECRET_EXTRA);
   }
 
diff --git a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
index bf04fef501..f9b5eee8c4 100644
--- a/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/PushContactSelectionActivity.java
@@ -21,6 +21,7 @@ import android.os.Bundle;
 import android.util.Log;
 
 import org.thoughtcrime.securesms.util.DirectoryHelper;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
@@ -43,13 +44,15 @@ public class PushContactSelectionActivity extends PassphraseRequiredSherlockFrag
   private final static String TAG             = "ContactSelectActivity";
   public  final static String PUSH_ONLY_EXTRA = "push_only";
 
-  private final DynamicTheme dynamicTheme = new DynamicTheme();
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme   ();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
   private PushContactSelectionListFragment contactsFragment;
 
   @Override
   protected void onCreate(Bundle icicle) {
     dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
     super.onCreate(icicle);
 
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -62,6 +65,8 @@ public class PushContactSelectionActivity extends PassphraseRequiredSherlockFrag
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__select_contacts);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
index ab4c885729..4f3cda5ad5 100644
--- a/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
+++ b/src/org/thoughtcrime/securesms/ReviewIdentitiesActivity.java
@@ -21,15 +21,18 @@ import android.os.Bundle;
 import com.actionbarsherlock.app.SherlockFragmentActivity;
 import com.actionbarsherlock.view.MenuItem;
 
+import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 
 public class ReviewIdentitiesActivity extends SherlockFragmentActivity {
 
-  private final DynamicTheme dynamicTheme = new DynamicTheme();
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
 
   @Override
   public void onCreate(Bundle bundle) {
     dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
     super.onCreate(bundle);
     setContentView(R.layout.review_identities);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
@@ -39,12 +42,14 @@ public class ReviewIdentitiesActivity extends SherlockFragmentActivity {
   public void onResume() {
     super.onResume();
     dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__manage_identity_keys);
   }
 
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-      case android.R.id.home: finish(); return true;
+    case android.R.id.home: finish(); return true;
     }
 
     return false;
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index cba5b018c2..869ca07d0a 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -18,25 +18,16 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Intent;
-import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.ContactsContract;
-import android.util.Log;
-import android.view.View;
 import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.ListView;
 
 import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 
-import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
-import org.thoughtcrime.securesms.service.DirectoryRefreshListener;
-import org.thoughtcrime.securesms.util.ActionBarUtil;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
@@ -66,7 +57,6 @@ public class ShareActivity extends PassphraseRequiredSherlockFragmentActivity
     super.onCreate(icicle);
 
     setContentView(R.layout.share_activity);
-    ActionBarUtil.initializeDefaultActionBar(this, getSupportActionBar(), R.string.ShareActivity_share_with);
     initializeResources();
   }
 
@@ -81,6 +71,7 @@ public class ShareActivity extends PassphraseRequiredSherlockFragmentActivity
     super.onResume();
     dynamicTheme.onResume(this);
     dynamicLanguage.onResume(this);
+    getSupportActionBar().setTitle(R.string.ShareActivity_share_with);
   }
 
   @Override
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index 3af573dd82..8fe212ba52 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -23,6 +23,8 @@ import android.widget.Toast;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.MemoryCleaner;
 import org.whispersystems.textsecure.crypto.IdentityKey;
 import org.whispersystems.textsecure.crypto.MasterSecret;
@@ -37,7 +39,7 @@ import org.whispersystems.textsecure.storage.Session;
  */
 public class VerifyIdentityActivity extends KeyScanningActivity {
 
-  private Recipient recipient;
+  private Recipient    recipient;
   private MasterSecret masterSecret;
 
   private TextView localIdentityFingerprint;
@@ -45,8 +47,13 @@ public class VerifyIdentityActivity extends KeyScanningActivity {
 
   private int keyType;
 
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme   ();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
   @Override
   public void onCreate(Bundle state) {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
     super.onCreate(state);
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     setContentView(R.layout.verify_identity_activity);
@@ -55,6 +62,15 @@ public class VerifyIdentityActivity extends KeyScanningActivity {
     initializeFingerprints();
   }
 
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+    getSupportActionBar().setTitle(R.string.AndroidManifest__verify_identity);
+
+  }
+
   @Override
   protected void onDestroy() {
     MemoryCleaner.clean(masterSecret);