diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-25 02:37:36 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-07-25 02:59:26 +0200 |
commit | cd7e8d7495d36c7e958e591a02b9aef0929730bd (patch) | |
tree | 6b8383d5b7c723d8fc2eb50689930fe791b015ae /app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java | |
parent | Added QR code scanner as tunnel import method (diff) | |
download | wireguard-android-cd7e8d7495d36c7e958e591a02b9aef0929730bd.tar.xz wireguard-android-cd7e8d7495d36c7e958e591a02b9aef0929730bd.zip |
qrcode: minor adjustments
Diffstat (limited to '')
-rw-r--r-- | app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java index 23e449b6..e2291f9c 100644 --- a/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java +++ b/app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java @@ -83,10 +83,8 @@ public class TunnelListFragment extends BaseFragment { // Config text is valid, now create the tunnel… final FragmentManager fragmentManager = getFragmentManager(); - if (fragmentManager != null) { - final ConfigNamingDialogFragment fragment = ConfigNamingDialogFragment.newInstance(configText); - fragment.show(fragmentManager, null); - } + if (fragmentManager != null) + ConfigNamingDialogFragment.newInstance(configText).show(fragmentManager, null); } catch (final IllegalArgumentException|IOException exception) { onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(exception)); } @@ -246,6 +244,8 @@ public class TunnelListFragment extends BaseFragment { public void onRequestScanQRCode(@SuppressWarnings("unused") final View view) { final IntentIntegrator intentIntegrator = IntentIntegrator.forSupportFragment(this); intentIntegrator.setOrientationLocked(false); + intentIntegrator.setBeepEnabled(false); + intentIntegrator.setPrompt(getString(R.string.qrcode_hint)); intentIntegrator.initiateScan(Collections.singletonList(IntentIntegrator.QR_CODE)); if (binding != null) |