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

phase 1: Activities and Fragments

Browse Source
This commit is contained in:
Ernir Erlingsson
2016-03-31 00:17:05 +02:00
parent 1724fbe5a9
commit 7b552bde1e
32 changed files with 312 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
briar-android/src/org/briarproject/android/contact/ContactListFragment.java
View File

@@ -13,12 +13,14 @@ import android.view.ViewGroup;
import org.briarproject.R;
import org.briarproject.android.AndroidComponent;
import org.briarproject.android.BriarApplication;
import org.briarproject.android.fragment.BaseEventFragment;
import org.briarproject.android.keyagreement.KeyAgreementActivity;
import org.briarproject.android.util.BriarRecyclerView;
import org.briarproject.api.contact.Contact;
import org.briarproject.api.contact.ContactId;
import org.briarproject.api.contact.ContactManager;
import org.briarproject.api.crypto.CryptoComponent;
import org.briarproject.api.db.DbException;
import org.briarproject.api.db.NoSuchContactException;
import org.briarproject.api.event.ContactAddedEvent;
@@ -28,6 +30,7 @@ import org.briarproject.api.event.ContactRemovedEvent;
import org.briarproject.api.event.ContactStatusChangedEvent;
import org.briarproject.api.event.Event;
import org.briarproject.api.event.EventBus;
import org.briarproject.api.event.EventListener;
import org.briarproject.api.event.MessageValidatedEvent;
import org.briarproject.api.forum.ForumInvitationMessage;
import org.briarproject.api.forum.ForumSharingManager;
@@ -52,13 +55,14 @@ import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
import static org.briarproject.android.BriarActivity.GROUP_ID;
public class ContactListFragment extends BaseEventFragment {
public class ContactListFragment extends BaseFragment implements EventListener {
private static final Logger LOG =
Logger.getLogger(ContactListFragment.class.getName());
public final static String TAG = "ContactListFragment";
/*
public static ContactListFragment newInstance() {
Bundle args = new Bundle();
@@ -67,6 +71,7 @@ public class ContactListFragment extends BaseEventFragment {
fragment.setArguments(args);
return fragment;
}
*/
@Override
public String getUniqueTag() {
@@ -92,9 +97,14 @@ public class ContactListFragment extends BaseEventFragment {
@Inject
protected volatile EventBus eventBus;
@Override
public void injectActivity(AndroidComponent component) {
component.inject(this);
// @Override
// public void injectActivity(AndroidComponent component) {
// component.inject(this);
// }
@Inject
public ContactListFragment() {
}
@Nullable
@@ -155,7 +165,7 @@ public class ContactListFragment extends BaseEventFragment {
@Override
public void onResume() {
super.onResume();
eventBus.addListener(this);
loadContacts();
}
@@ -163,6 +173,7 @@ public class ContactListFragment extends BaseEventFragment {
public void onPause() {
super.onPause();
adapter.clear();
eventBus.removeListener(this);
}
private void loadContacts() {

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

@@ -23,6 +23,7 @@ import android.widget.TextView;
import android.widget.Toast;
import org.briarproject.R;
import org.briarproject.android.ActivityComponent;
import org.briarproject.android.AndroidComponent;
import org.briarproject.android.BriarActivity;
import org.briarproject.android.api.AndroidNotificationManager;
@@ -157,7 +158,7 @@ public class ConversationActivity extends BriarActivity
}
@Override
public void injectActivity(AndroidComponent component) {
public void injectActivity(ActivityComponent component) {
component.inject(this);
}