diff options
author | Christian Schneppe <christian@pix-art.de> | 2019-02-04 20:21:22 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2019-02-04 20:21:22 +0100 |
commit | 67b5d19834cfb5fdc6850e720f446cddc1dd60ff (patch) | |
tree | 215b0397627c28a92157e2b3673bba5359550a73 /src/main/java/de/pixart | |
parent | 57f7aefb46c4ab574fcbe435635dc11a795e4e7c (diff) |
Revert "WelcomeActivity: Add QR code scanner button"
This reverts commit 7b9ced9fb752ee485b657daf6d827f311ed6e8bc.
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/WelcomeActivity.java | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java index 2ea4fc278..0ce07dda4 100644 --- a/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java +++ b/src/main/java/de/pixart/messenger/ui/WelcomeActivity.java @@ -16,8 +16,6 @@ import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; import android.view.View; import android.widget.Button; import android.widget.EditText; @@ -42,7 +40,6 @@ import de.pixart.messenger.entities.Account; import de.pixart.messenger.persistance.DatabaseBackend; import de.pixart.messenger.persistance.FileBackend; import de.pixart.messenger.utils.EncryptDecryptFile; -import de.pixart.messenger.utils.MenuDoubleTabUtil; import de.pixart.messenger.utils.XmppUri; import static de.pixart.messenger.utils.PermissionUtils.allGranted; @@ -127,27 +124,6 @@ public class WelcomeActivity extends XmppActivity { } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.welcome, menu); - MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code); - qrCodeScanMenuItem.setVisible(isCameraFeatureAvailable()); - return super.onCreateOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (MenuDoubleTabUtil.shouldIgnoreTap()) { - return false; - } - if (item.getItemId() == R.id.action_scan_qr_code) { - UriHandlerActivity.scan(this); - return true; - - } - return super.onOptionsItemSelected(item); - } - public void addInviteUri(Intent intent) { StartConversationActivity.addInviteUri(intent, getIntent()); } |