Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +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

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);
}