Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 10:49:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '583-npe-org-briarproject-android-util-qrcodeutils-createqrcode' into 'master'

Browse Source 
Fix two crashes when scanning QR codes

One crash was two due the `Context` being `null` and the other due to the camera being opened within an `AsyncTask`.

Closes #583

See merge request !282
This commit is contained in:
akwizgran
2016-08-19 19:32:24 +00:00
parent 746fce1b95 b3d6e7d12d
commit d34afa5f30
5 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/res/values/strings.xml
View File

@@ -93,6 +93,7 @@
<string name="searching_format">Searching for contact with invitation code %06d\u2026</string>
<string name="connection_failed">Connection failed</string>
<string name="could_not_find_contact">Briar could not find your contact nearby</string>
<string name="could_not_open_camera">Could not access your camera. Please try again!</string>
<string name="try_again_button">Try Again</string>
<string name="connected_to_contact">Connected to contact</string>
<string name="calculating_confirmation_code">Calculating confirmation code\u2026</string>

3
briar-android/src/org/briarproject/android/BriarFragmentActivity.java
View File

@@ -53,7 +53,6 @@ public abstract class BriarFragmentActivity extends BriarActivity {
as in Gmail/Inbox.
*/
startFragment(ContactListFragment.newInstance());
} else {
super.onBackPressed();
}
@@ -80,7 +79,7 @@ public abstract class BriarFragmentActivity extends BriarActivity {
dialog.show();
}
private void startFragment(BaseFragment fragment,
public void startFragment(BaseFragment fragment,
boolean isAddedToBackStack) {
startFragment(fragment, 0, 0, isAddedToBackStack);
}

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

@@ -2,6 +2,7 @@ package org.briarproject.android.keyagreement;
import android.os.Bundle;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
import android.widget.Toast;
@@ -9,7 +10,8 @@ import android.widget.Toast;
import org.briarproject.R;
import org.briarproject.android.ActivityComponent;
import org.briarproject.android.BriarFragmentActivity;
import org.briarproject.android.fragment.BaseFragment;
import org.briarproject.android.fragment.BaseFragment.BaseFragmentListener;
import org.briarproject.android.keyagreement.ChooseIdentityFragment.IdentitySelectedListener;
import org.briarproject.android.util.CustomAnimations;
import org.briarproject.api.contact.ContactExchangeListener;
import org.briarproject.api.contact.ContactExchangeTask;
@@ -32,8 +34,7 @@ import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.WARNING;
public class KeyAgreementActivity extends BriarFragmentActivity implements
BaseFragment.BaseFragmentListener,
ChooseIdentityFragment.IdentitySelectedListener, EventListener,
BaseFragmentListener, IdentitySelectedListener, EventListener,
ContactExchangeListener {
private static final Logger LOG =
@@ -43,7 +44,6 @@ public class KeyAgreementActivity extends BriarFragmentActivity implements
private static final int STEP_ID = 1;
private static final int STEP_QR = 2;
private static final int STEPS = 2;
@Inject
protected EventBus eventBus;
@@ -87,15 +87,14 @@ public class KeyAgreementActivity extends BriarFragmentActivity implements
showStep(localAuthorId == null ? STEP_ID : STEP_QR);
}
@SuppressWarnings("ConstantConditions")
private void showStep(int step) {
switch (step) {
case STEP_QR:
startFragment(ShowQrCodeFragment.newInstance());
startFragment(ShowQrCodeFragment.newInstance(), true);
break;
case STEP_ID:
default:
startFragment(ChooseIdentityFragment.newInstance());
startFragment(ChooseIdentityFragment.newInstance(), true);
break;
}
}
@@ -121,6 +120,26 @@ public class KeyAgreementActivity extends BriarFragmentActivity implements
}
}
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
onBackPressed();
return true;
default:
return super.onOptionsItemSelected(item);
}
}
@Override
public void onBackPressed() {
if (getSupportFragmentManager().getBackStackEntryCount() == 1) {
supportFinishAfterTransition();
} else {
super.onBackPressed();
}
}
@Override
public void showLoadingScreen(boolean isBlocking, int stringId) {
if (isBlocking) {

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

@@ -6,7 +6,6 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.hardware.Camera;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.util.Base64;
@@ -53,7 +52,6 @@ import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
import static android.widget.Toast.LENGTH_LONG;
import static java.util.logging.Level.WARNING;
@SuppressWarnings("deprecation")
public class ShowQrCodeFragment extends BaseEventFragment
implements QrCodeDecoder.ResultCallback {
@@ -195,44 +193,24 @@ public class ShowQrCodeFragment extends BaseEventFragment
});
}
@SuppressWarnings("deprecation")
private void openCamera() {
AsyncTask<Void, Void, Camera> openTask =
new AsyncTask<Void, Void, Camera>() {
@Override
protected Camera doInBackground(Void... unused) {
LOG.info("Opening camera");
try {
return Camera.open();
} catch (RuntimeException e) {
LOG.log(WARNING,
"Error opening camera, trying again", e);
try {
Thread.sleep(1000);
} catch (InterruptedException e2) {
LOG.info("Interrupted before second attempt");
return null;
}
try {
return Camera.open();
} catch (RuntimeException e2) {
LOG.log(WARNING, "Error opening camera", e2);
return null;
}
}
}
@Override
protected void onPostExecute(Camera camera) {
if (camera == null) {
// TODO better solution?
LOG.info("No Camera found, finishing...");
getActivity().finish();
} else {
cameraView.start(camera, decoder, 0);
}
}
};
openTask.execute();
LOG.info("Opening camera");
Camera camera;
try {
camera = Camera.open();
} catch (RuntimeException e) {
LOG.log(WARNING, e.toString(), e);
camera = null;
}
if (camera == null) {
LOG.log(WARNING, "Error opening camera");
Toast.makeText(getActivity(), R.string.could_not_open_camera,
LENGTH_LONG).show();
finish();
return;
}
cameraView.start(camera, decoder, 0);
}
private void releaseCamera() {
@@ -242,7 +220,7 @@ public class ShowQrCodeFragment extends BaseEventFragment
} catch (RuntimeException e) {
LOG.log(WARNING, "Error releasing camera", e);
// TODO better solution
getActivity().finish();
finish();
}
}
@@ -295,7 +273,7 @@ public class ShowQrCodeFragment extends BaseEventFragment
String input = Base64.encodeToString(
payloadEncoder.encode(localPayload), 0);
qrCode.setImageBitmap(
QrCodeUtils.createQrCode(getActivity(), input));
QrCodeUtils.createQrCode((Context) listener, input));
// Simple fade-in animation
AlphaAnimation anim = new AlphaAnimation(0.0f, 1.0f);
anim.setDuration(200);
@@ -365,6 +343,10 @@ public class ShowQrCodeFragment extends BaseEventFragment
});
}
private void finish() {
getActivity().getSupportFragmentManager().popBackStack();
}
private class BluetoothStateReceiver extends BroadcastReceiver {
@Override

7
briar-android/src/org/briarproject/android/util/QrCodeUtils.java
View File

@@ -1,6 +1,6 @@
package org.briarproject.android.util;
import android.app.Activity;
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.util.DisplayMetrics;
@@ -19,10 +19,9 @@ public class QrCodeUtils {
private static final Logger LOG =
Logger.getLogger(QrCodeUtils.class.getName());
public static Bitmap createQrCode(Activity activity, String input) {
public static Bitmap createQrCode(Context context, String input) {
// Get narrowest screen dimension
DisplayMetrics dm = new DisplayMetrics();
activity.getWindowManager().getDefaultDisplay().getMetrics(dm);
DisplayMetrics dm = context.getResources().getDisplayMetrics();
int smallestDimen = Math.min(dm.widthPixels, dm.heightPixels);
try {
// Generate QR code