Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1177-blank-viewfinder' into 'master'

Browse Source 
Show viewfinder again after connection fails

Closes #1177

See merge request akwizgran/briar!735
This commit is contained in:
Torsten Grote
2018-03-20 13:13:14 +00:00
parent 4d502576c9 701e51dfc8
commit 235183a3af
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementActivity.java
View File

@@ -9,6 +9,7 @@ import android.content.IntentFilter;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.UiThread; import android.support.annotation.UiThread;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentManager;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
import android.support.v7.app.AlertDialog.Builder; import android.support.v7.app.AlertDialog.Builder;
import android.support.v7.widget.Toolbar; import android.support.v7.widget.Toolbar;
@@ -206,11 +207,14 @@ public class KeyAgreementActivity extends BriarActivity implements
private void showQrCodeFragment() { private void showQrCodeFragment() {
// FIXME #824 // FIXME #824
BaseFragment f = ShowQrCodeFragment.newInstance(); FragmentManager fm = getSupportFragmentManager();
getSupportFragmentManager().beginTransaction() if (fm.findFragmentByTag(ShowQrCodeFragment.TAG) == null) {
.replace(R.id.fragmentContainer, f, f.getUniqueTag()) BaseFragment f = ShowQrCodeFragment.newInstance();
.addToBackStack(f.getUniqueTag()) fm.beginTransaction()
.commit(); .replace(R.id.fragmentContainer, f, f.getUniqueTag())
.addToBackStack(f.getUniqueTag())
.commit();
}
} }
private boolean checkPermissions() { private boolean checkPermissions() {

9
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java
View File

@@ -24,7 +24,6 @@ import java.util.logging.Logger;
import static com.google.zxing.DecodeHintType.CHARACTER_SET; import static com.google.zxing.DecodeHintType.CHARACTER_SET;
import static java.util.Collections.singletonMap; import static java.util.Collections.singletonMap;
import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING; import static java.util.logging.Level.WARNING;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@@ -67,7 +66,6 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
@Override @Override
public void onPreviewFrame(byte[] data, Camera camera) { public void onPreviewFrame(byte[] data, Camera camera) {
if (camera == this.camera) { if (camera == this.camera) {
LOG.info("Got preview frame");
try { try {
Size size = camera.getParameters().getPreviewSize(); Size size = camera.getParameters().getPreviewSize();
// The preview should be in NV21 format: width * height bytes of // The preview should be in NV21 format: width * height bytes of
@@ -105,20 +103,13 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
@Override @Override
protected Void doInBackground(Void... params) { protected Void doInBackground(Void... params) {
long now = System.currentTimeMillis();
BinaryBitmap bitmap = binarize(data, width, height, orientation); BinaryBitmap bitmap = binarize(data, width, height, orientation);
Result result; Result result;
try { try {
result = reader.decode(bitmap, result = reader.decode(bitmap,
singletonMap(CHARACTER_SET, "ISO8859_1")); singletonMap(CHARACTER_SET, "ISO8859_1"));
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("Decoding barcode took " + duration + " ms");
} catch (ReaderException e) { } catch (ReaderException e) {
// No barcode found // No barcode found
long duration = System.currentTimeMillis() - now;
if (LOG.isLoggable(INFO))
LOG.info("No barcode found after " + duration + " ms");
return null; return null;
} catch (RuntimeException e) { } catch (RuntimeException e) {
LOG.warning("Invalid preview frame"); LOG.warning("Invalid preview frame");

12
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/ShowQrCodeFragment.java
View File

@@ -61,7 +61,8 @@ import static java.util.logging.Level.WARNING;
public class ShowQrCodeFragment extends BaseEventFragment public class ShowQrCodeFragment extends BaseEventFragment
implements QrCodeDecoder.ResultCallback { implements QrCodeDecoder.ResultCallback {
private static final String TAG = ShowQrCodeFragment.class.getName(); static final String TAG = ShowQrCodeFragment.class.getName();
private static final Logger LOG = Logger.getLogger(TAG); private static final Logger LOG = Logger.getLogger(TAG);
private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1"); private static final Charset ISO_8859_1 = Charset.forName("ISO-8859-1");
@@ -207,6 +208,15 @@ public class ShowQrCodeFragment extends BaseEventFragment
@UiThread @UiThread
private void reset() { private void reset() {
// If we've stopped the camera view, restart it
if (gotRemotePayload) {
try {
cameraView.start(getScreenRotationDegrees());
} catch (CameraException e) {
logCameraExceptionAndFinish(e);
return;
}
}
statusView.setVisibility(INVISIBLE); statusView.setVisibility(INVISIBLE);
cameraView.setVisibility(VISIBLE); cameraView.setVisibility(VISIBLE);
gotRemotePayload = false; gotRemotePayload = false;