make camera feature optional

1 files changed, 9 insertions, 5 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 40572a71a..69deb91e3 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -447,11 +447,15 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         MenuItem qrCodeScanMenuItem = menu.findItem(R.id.action_scan_qr_code);
         final MenuItem menuEditProfiles = menu.findItem(R.id.action_accounts);
         if (qrCodeScanMenuItem != null) {
-            Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-            boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
-                    && fragment != null
-                    && fragment instanceof ConversationsOverviewFragment;
-            qrCodeScanMenuItem.setVisible(visible);
+            if (isCameraFeatureAvailable()) {
+                Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+                boolean visible = getResources().getBoolean(R.bool.show_qr_code_scan)
+                        && fragment != null
+                        && fragment instanceof ConversationsOverviewFragment;
+                qrCodeScanMenuItem.setVisible(visible);
+            } else {
+                qrCodeScanMenuItem.setVisible(false);
+            }
         }
         if (xmppConnectionServiceBound && xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) {
             menuEditProfiles.setTitle(R.string.mgmt_account_edit);