Remove scan successful sound and fix a setting does not work

trebleshot · Feb 23, 2018 · 2079ea8 · 2079ea8
1 parent ebb2655
commit 2079ea8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/app/src/main/java/com/genonbeta/TrebleShot/activity/ShareActivity.java b/app/src/main/java/com/genonbeta/TrebleShot/activity/ShareActivity.java
@@ -680,11 +680,13 @@ private void requestQRScan()
 	{
 		mQRScanRequested = false;
 
-		IntentIntegrator integrator = new IntentIntegrator(this);
-		integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES);
-		integrator.setPrompt(getString(R.string.text_scanQRCodeHelp));
-		integrator.setOrientationLocked(false);
-		integrator.setBarcodeImageEnabled(true);
+		IntentIntegrator integrator = new IntentIntegrator(this)
+				.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES)
+				.setPrompt(getString(R.string.text_scanQRCodeHelp))
+				.setOrientationLocked(false)
+				.setBarcodeImageEnabled(true)
+				.setBeepEnabled(false);
+
 		integrator.initiateScan();
 	}
 

diff --git a/app/src/main/java/com/genonbeta/TrebleShot/service/CommunicationService.java b/app/src/main/java/com/genonbeta/TrebleShot/service/CommunicationService.java
@@ -426,10 +426,10 @@ public void setupHotspot()
 	{
 		boolean isEnabled = !getHotspotUtils().isEnabled();
 
-		if (mHotspotUtils.isStarted()
-				&& getNotificationHelper().getUtils()
+		if (getNotificationHelper().getUtils()
 				.getPreferences()
-				.getBoolean("hotspot_trust", false))
+				.getBoolean("hotspot_trust", false)
+				&& (mHotspotUtils.isStarted() || isEnabled))
 			updateServiceState(isEnabled);
 
 		if (isEnabled)