aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/WelcomeActivity.java24
-rw-r--r--src/main/res/menu/welcome.xml11
2 files changed, 0 insertions, 35 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());
}
diff --git a/src/main/res/menu/welcome.xml b/src/main/res/menu/welcome.xml
deleted file mode 100644
index b767dc0f4..000000000
--- a/src/main/res/menu/welcome.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto">
-
- <item
- android:id="@+id/action_scan_qr_code"
- android:icon="?attr/icon_scan_qr_code"
- android:title="@string/scan_qr_code"
- app:showAsAction="always" />
-
-</menu> \ No newline at end of file