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

Fix a possible null reference bug

Browse Source
This commit is contained in:
goapunk
2018-07-03 11:09:43 +02:00
parent 457d77ca51
commit 28ea3d014a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -177,7 +177,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
// FIXME #824 // FIXME #824
FragmentManager fm = getSupportFragmentManager(); FragmentManager fm = getSupportFragmentManager();
if (fm.findFragmentByTag(KeyAgreementFragment.TAG) == null) { if (fm.findFragmentByTag(KeyAgreementFragment.TAG) == null) {
BaseFragment f = KeyAgreementFragment.newInstance(this); BaseFragment f = KeyAgreementFragment.newInstance();
fm.beginTransaction() fm.beginTransaction()
.replace(R.id.fragmentContainer, f, f.getUniqueTag()) .replace(R.id.fragmentContainer, f, f.getUniqueTag())
.addToBackStack(f.getUniqueTag()) .addToBackStack(f.getUniqueTag())

10
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/KeyAgreementFragment.java
View File

@@ -91,15 +91,19 @@ public class KeyAgreementFragment extends BaseEventFragment
private KeyAgreementTask task; private KeyAgreementTask task;
private KeyAgreementEventListener listener; private KeyAgreementEventListener listener;
public static KeyAgreementFragment newInstance( public static KeyAgreementFragment newInstance() {
KeyAgreementEventListener listener) {
Bundle args = new Bundle(); Bundle args = new Bundle();
KeyAgreementFragment fragment = new KeyAgreementFragment(); KeyAgreementFragment fragment = new KeyAgreementFragment();
fragment.listener = listener;
fragment.setArguments(args); fragment.setArguments(args);
return fragment; return fragment;
} }
@Override
public void onAttach(Context context) {
super.onAttach(context);
listener = (KeyAgreementEventListener) context;
}
@Override @Override
public void injectFragment(ActivityComponent component) { public void injectFragment(ActivityComponent component) {
component.inject(this); component.inject(this);