diff --git a/src/org/thoughtcrime/securesms/CountrySelectionActivity.java b/src/org/thoughtcrime/securesms/CountrySelectionActivity.java index 25563a6e38..4c6b997de7 100644 --- a/src/org/thoughtcrime/securesms/CountrySelectionActivity.java +++ b/src/org/thoughtcrime/securesms/CountrySelectionActivity.java @@ -2,8 +2,10 @@ package org.thoughtcrime.securesms; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.support.v4.app.FragmentActivity; +import android.view.KeyEvent; import org.thoughtcrime.securesms.util.DynamicTheme; @@ -27,4 +29,21 @@ public class CountrySelectionActivity extends FragmentActivity this.setResult(RESULT_OK, result); this.finish(); } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } } diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java index 0cb227c8c1..e38154d630 100644 --- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java +++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java @@ -23,8 +23,10 @@ import android.content.Intent; import android.content.pm.PackageManager; import android.database.Cursor; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.util.Log; +import android.view.KeyEvent; import android.view.View; import android.widget.ProgressBar; @@ -247,4 +249,20 @@ public class DatabaseUpgradeActivity extends Activity { } } + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } } diff --git a/src/org/thoughtcrime/securesms/LogSubmitActivity.java b/src/org/thoughtcrime/securesms/LogSubmitActivity.java index 870c6becb0..45c48d1140 100644 --- a/src/org/thoughtcrime/securesms/LogSubmitActivity.java +++ b/src/org/thoughtcrime/securesms/LogSubmitActivity.java @@ -1,6 +1,7 @@ package org.thoughtcrime.securesms; import android.app.AlertDialog; +import android.os.Build; import android.support.v7.app.ActionBarActivity; import android.text.ClipboardManager; import android.content.DialogInterface; @@ -9,6 +10,7 @@ import android.os.Bundle; import android.text.TextUtils; import android.util.Log; import android.util.TypedValue; +import android.view.KeyEvent; import android.view.MenuItem; import android.view.View; import android.widget.Button; @@ -231,4 +233,21 @@ public class LogSubmitActivity extends ActionBarActivity { } } } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } } diff --git a/src/org/thoughtcrime/securesms/PassphraseActivity.java b/src/org/thoughtcrime/securesms/PassphraseActivity.java index 465b4b2759..a1b832979f 100644 --- a/src/org/thoughtcrime/securesms/PassphraseActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseActivity.java @@ -20,8 +20,10 @@ import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.ServiceConnection; +import android.os.Build; import android.os.IBinder; import android.support.v7.app.ActionBarActivity; +import android.view.KeyEvent; import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.service.KeyCachingService; @@ -70,4 +72,21 @@ public abstract class PassphraseActivity extends ActionBarActivity { keyCachingService = null; } }; + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } } diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index a7b1e9ebcc..b10ba91142 100644 --- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -1,7 +1,9 @@ package org.thoughtcrime.securesms; +import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.view.KeyEvent; import org.thoughtcrime.securesms.crypto.MasterSecret; @@ -41,4 +43,20 @@ public class PassphraseRequiredActionBarActivity extends ActionBarActivity imple @Override public void onNewMasterSecret(MasterSecret masterSecret) {} + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } } diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java index 60befbabbe..402035eec1 100644 --- a/src/org/thoughtcrime/securesms/RegistrationActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java @@ -4,6 +4,7 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; import android.telephony.TelephonyManager; @@ -11,6 +12,7 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.Log; +import android.view.KeyEvent; import android.view.MotionEvent; import android.view.View; import android.widget.ArrayAdapter; @@ -288,4 +290,21 @@ public class RegistrationActivity extends ActionBarActivity { finish(); } } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } } diff --git a/src/org/thoughtcrime/securesms/RegistrationProblemsActivity.java b/src/org/thoughtcrime/securesms/RegistrationProblemsActivity.java index b26ff129a1..6dba1c29ea 100644 --- a/src/org/thoughtcrime/securesms/RegistrationProblemsActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationProblemsActivity.java @@ -1,7 +1,9 @@ package org.thoughtcrime.securesms; +import android.os.Build; import android.os.Bundle; import android.support.v7.app.ActionBarActivity; +import android.view.KeyEvent; import android.view.View; import android.widget.Button; @@ -21,4 +23,21 @@ public class RegistrationProblemsActivity extends ActionBarActivity { } }); } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } } diff --git a/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java b/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java index 8804897461..307561e600 100644 --- a/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java +++ b/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java @@ -9,6 +9,7 @@ import android.content.IntentFilter; import android.content.ServiceConnection; import android.graphics.Color; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.os.IBinder; @@ -20,6 +21,7 @@ import android.text.TextUtils; import android.text.method.LinkMovementMethod; import android.text.style.ClickableSpan; import android.util.Log; +import android.view.KeyEvent; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -624,4 +626,21 @@ public class RegistrationProgressActivity extends ActionBarActivity { } } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + return true; + } + return super.onKeyDown(keyCode, event); + } + + @Override + public boolean onKeyUp(int keyCode, KeyEvent event) { + if (keyCode == KeyEvent.KEYCODE_MENU && "LGE".equalsIgnoreCase(Build.BRAND)) { + openOptionsMenu(); + return true; + } + return super.onKeyUp(keyCode, event); + } }