aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-04-08 14:09:01 +0200
committerChristian Schneppe <christian@pix-art.de>2018-04-08 14:09:01 +0200
commitbcf0a5482643f6d00b15db364d7c5544e25f7414 (patch)
treeb74596b34c57bbd83a8c9b42ba260f8434253b25 /src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
parent25d05543e9932bae0b606fc1783051e305c218f8 (diff)
make camera feature optional
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
index 1f408138d..be4c86549 100644
--- a/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/TrustKeysActivity.java
@@ -110,7 +110,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.trust_keys, menu);
MenuItem scanQrCode = menu.findItem(R.id.action_scan_qr_code);
- scanQrCode.setVisible(ownKeysToTrust.size() > 0 || foreignActuallyHasKeys());
+ scanQrCode.setVisible((ownKeysToTrust.size() > 0 || foreignActuallyHasKeys()) && isCameraFeatureAvailable());
return super.onCreateOptionsMenu(menu);
}
@@ -221,7 +221,7 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
}
}
- if ((hasOwnKeys || foreignActuallyHasKeys()) && mUseCameraHintShown.compareAndSet(false,true)) {
+ if ((hasOwnKeys || foreignActuallyHasKeys()) && isCameraFeatureAvailable() && mUseCameraHintShown.compareAndSet(false, true)) {
showCameraToast();
}