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

merge

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-04-01 14:52:17 +02:00
parent a9de12520d
commit 5d8ba660c2
7 changed files with 79 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -86,11 +86,9 @@ public class ShowQrCodeFragment extends BaseEventFragment
private volatile KeyAgreementTask task;
private volatile boolean waitingForBluetooth;
public static ShowQrCodeFragment newInstance() {
Bundle args = new Bundle();
ShowQrCodeFragment fragment = new ShowQrCodeFragment();
fragment.setArguments(args);
return fragment;
@Inject
public ShowQrCodeFragment() {
}
@Override
@@ -98,11 +96,6 @@ public class ShowQrCodeFragment extends BaseEventFragment
return TAG;
}
@Override
public void injectActivity(AndroidComponent component) {
component.inject(this);
}
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,