yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

refactor ProfileActivity extras

Browse source
This commit is contained in:
B. Petersen 2019-05-17 17:15:50 +02:00
parent d80e930e19
commit 6b880244b8
No known key found for this signature in database
GPG key ID: 3B88E92DEA8E9AFC
4 changed files with 108 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -540,7 +540,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void handleProfile() { private void handleProfile() {
if(chatId != DcChat.DC_CHAT_ID_DEADDROP) { if(chatId != DcChat.DC_CHAT_ID_DEADDROP) {
Intent intent = new Intent(this, ProfileActivity.class); Intent intent = new Intent(this, ProfileActivity.class);
intent.putExtra(ProfileActivity.ADDRESS_EXTRA, recipient.getAddress()); intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, chatId);
startActivity(intent); startActivity(intent);
} }
} }

11
src/org/thoughtcrime/securesms/MediaPreviewActivity.java
View file

@ -247,10 +247,19 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
} }
private void showOverview() { private void showOverview() {
if(conversationRecipient.getAddress().isDcChat()) {
Intent intent = new Intent(this, ProfileActivity.class); Intent intent = new Intent(this, ProfileActivity.class);
intent.putExtra(ProfileActivity.ADDRESS_EXTRA, conversationRecipient.getAddress()); intent.putExtra(ProfileActivity.CHAT_ID_EXTRA, conversationRecipient.getAddress().getDcChatId());
intent.putExtra(ProfileActivity.FORCE_TAB_EXTRA, ProfileActivity.TAB_GALLERY);
startActivity(intent); startActivity(intent);
} }
else if(conversationRecipient.getAddress().isDcContact()) {
Intent intent = new Intent(this, ProfileActivity.class);
intent.putExtra(ProfileActivity.CONTACT_ID_EXTRA, conversationRecipient.getAddress().getDcContactId());
intent.putExtra(ProfileActivity.FORCE_TAB_EXTRA, ProfileActivity.TAB_GALLERY);
startActivity(intent);
}
}
private void forward() { private void forward() {
MediaItem mediaItem = getCurrentMediaItem(); MediaItem mediaItem = getCurrentMediaItem();

107
src/org/thoughtcrime/securesms/ProfileActivity.java
View file

@ -9,6 +9,7 @@ import android.database.Cursor;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.TabLayout; import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
@ -31,10 +32,13 @@ import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.widget.TextView; import android.widget.TextView;
import com.b44t.messenger.DcChat;
import com.b44t.messenger.DcContact;
import com.b44t.messenger.DcContext; import com.b44t.messenger.DcContext;
import com.b44t.messenger.DcMsg; import com.b44t.messenger.DcMsg;
import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager; import com.codewaves.stickyheadergrid.StickyHeaderGridLayoutManager;
import org.thoughtcrime.securesms.connect.ApplicationDcContext;
import org.thoughtcrime.securesms.connect.DcHelper; import org.thoughtcrime.securesms.connect.DcHelper;
import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter; import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter;
@ -58,20 +62,34 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
@SuppressWarnings("unused") @SuppressWarnings("unused")
private final static String TAG = ProfileActivity.class.getSimpleName(); private final static String TAG = ProfileActivity.class.getSimpleName();
public static final String ADDRESS_EXTRA = "address"; public static final String CHAT_ID_EXTRA = "chat_id";
public static final String CONTACT_ID_EXTRA = "contact_id";
public static final String FORCE_TAB_EXTRA = "force_tab";
public static final int TAB_SETTINGS = 0;
public static final int TAB_GALLERY = 1;
public static final int TAB_DOCS = 2;
public static final int TAB_LINKS = 3;
public static final int TAB_MAP = 4;
private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme(); private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();
private final DynamicLanguage dynamicLanguage = new DynamicLanguage(); private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
private ApplicationDcContext dcContext;
private int chatId;
private @Nullable DcChat dcChat;
private int contactId;
private @Nullable DcContact dcContact;
private Toolbar toolbar; private Toolbar toolbar;
private TabLayout tabLayout; private TabLayout tabLayout;
private ViewPager viewPager; private ViewPager viewPager;
private Recipient recipient;
@Override @Override
protected void onPreCreate() { protected void onPreCreate() {
dynamicTheme.onCreate(this); dynamicTheme.onCreate(this);
dynamicLanguage.onCreate(this); dynamicLanguage.onCreate(this);
dcContext = DcHelper.getContext(this);
} }
@Override @Override
@ -104,19 +122,65 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
} }
private void initializeResources() { private void initializeResources() {
Address address = getIntent().getParcelableExtra(ADDRESS_EXTRA); chatId = getIntent().getIntExtra(CHAT_ID_EXTRA, 0);
contactId = getIntent().getIntExtra(CONTACT_ID_EXTRA, 0);
if (contactId!=0) {
dcContact = dcContext.getContact(contactId);
chatId = dcContext.getChatIdByContactId(contactId);
if (chatId!=0) {
dcChat = dcContext.getChat(chatId);
}
}
else if(chatId!=0) {
dcChat = dcContext.getChat(chatId);
if(!dcChat.isGroup()) {
final int[] members = dcContext.getChatContacts(chatId);
contactId = members.length>=1? members[0] : 0;
if (contactId!=0) {
dcContact = dcContext.getContact(contactId);
}
}
}
this.viewPager = ViewUtil.findById(this, R.id.pager); this.viewPager = ViewUtil.findById(this, R.id.pager);
this.toolbar = ViewUtil.findById(this, R.id.toolbar); this.toolbar = ViewUtil.findById(this, R.id.toolbar);
this.tabLayout = ViewUtil.findById(this, R.id.tab_layout); this.tabLayout = ViewUtil.findById(this, R.id.tab_layout);
this.recipient = Recipient.from(this, address);
} }
private void initializeToolbar() { private void initializeToolbar()
{
setSupportActionBar(this.toolbar); setSupportActionBar(this.toolbar);
getSupportActionBar().setTitle(recipient.toShortString());
getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayHomeAsUpEnabled(true);
this.recipient.addListener(recipient -> getSupportActionBar().setTitle(recipient.toShortString())); updateToolbar();
}
private void updateToolbar() {
if (isContactProfile()){
getSupportActionBar().setTitle(dcContact.getName());
}
else if (dcChat != null) {
getSupportActionBar().setTitle(dcChat.getName());
}
else {
getSupportActionBar().setTitle(R.string.menu_view_profile);
}
}
private boolean isContactProfile() {
return dcContact!=null && (dcChat==null || !dcChat.isGroup());
}
private Recipient getRecipient() {
if(dcChat!=null) {
return dcContext.getRecipient(dcChat);
}
else if(dcContact!=null) {
return dcContext.getRecipient(dcContact);
}
else {
return dcContext.getRecipient(dcContext.getContact(0));
}
} }
private class MediaOverviewPagerAdapter extends FragmentStatePagerAdapter { private class MediaOverviewPagerAdapter extends FragmentStatePagerAdapter {
@ -129,15 +193,15 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
public Fragment getItem(int position) { public Fragment getItem(int position) {
Fragment fragment; Fragment fragment;
if (position == 0) fragment = new MediaOverviewDocumentsFragment(); if (position == TAB_SETTINGS) fragment = new MediaOverviewDocumentsFragment();
else if (position == 1) fragment = new MediaOverviewGalleryFragment(); else if (position == TAB_GALLERY) fragment = new MediaOverviewGalleryFragment();
else if (position == 2) fragment = new MediaOverviewDocumentsFragment(); else if (position == TAB_DOCS) fragment = new MediaOverviewDocumentsFragment();
else if (position == 3) fragment = new MediaOverviewDocumentsFragment(); else if (position == TAB_LINKS) fragment = new MediaOverviewDocumentsFragment();
else if (position == 4) fragment = new MediaOverviewDocumentsFragment(); else if (position == TAB_MAP) fragment = new MediaOverviewDocumentsFragment();
else throw new AssertionError(); else throw new AssertionError();
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putString(MediaOverviewGalleryFragment.ADDRESS_EXTRA, recipient.getAddress().serialize()); args.putString(MediaOverviewGalleryFragment.ADDRESS_EXTRA, getRecipient().getAddress().serialize());
args.putSerializable(MediaOverviewGalleryFragment.LOCALE_EXTRA, dynamicLanguage.getCurrentLocale()); args.putSerializable(MediaOverviewGalleryFragment.LOCALE_EXTRA, dynamicLanguage.getCurrentLocale());
fragment.setArguments(args); fragment.setArguments(args);
@ -152,11 +216,18 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity {
@Override @Override
public CharSequence getPageTitle(int position) { public CharSequence getPageTitle(int position) {
if (position == 0) return getString(R.string.tab_contact); if (position == TAB_SETTINGS) {
else if (position == 1) return getString(R.string.tab_gallery); if(isContactProfile()) {
else if (position == 2) return getString(R.string.tab_docs); return getString(contactId==DcContact.DC_CONTACT_ID_SELF? R.string.self : R.string.tab_contact);
else if (position == 3) return getString(R.string.tab_links); }
else if (position == 4) return getString(R.string.tab_map); else {
return getString(R.string.tab_group);
}
}
else if (position == TAB_GALLERY) return getString(R.string.tab_gallery);
else if (position == TAB_DOCS) return getString(R.string.tab_docs);
else if (position == TAB_LINKS) return getString(R.string.tab_links);
else if (position == TAB_MAP) return getString(R.string.tab_map);
else throw new AssertionError(); else throw new AssertionError();
} }
} }

19
src/org/thoughtcrime/securesms/components/AvatarImageView.java
View file

@ -10,6 +10,7 @@ import android.util.AttributeSet;
import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.engine.DiskCacheStrategy;
import org.thoughtcrime.securesms.ProfileActivity;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.RecipientPreferenceActivity; import org.thoughtcrime.securesms.RecipientPreferenceActivity;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto; import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
@ -70,23 +71,11 @@ public class AvatarImageView extends AppCompatImageView {
private void setAvatarClickHandler(final Recipient recipient, boolean quickContactEnabled) { private void setAvatarClickHandler(final Recipient recipient, boolean quickContactEnabled) {
if (!recipient.isGroupRecipient() && quickContactEnabled) { if (!recipient.isGroupRecipient() && quickContactEnabled) {
super.setOnClickListener(v -> { super.setOnClickListener(v -> {
Intent intent = new Intent(getContext(), RecipientPreferenceActivity.class); if(recipient.getAddress().isDcContact()) {
intent.putExtra(RecipientPreferenceActivity.ADDRESS_EXTRA, recipient.getAddress()); Intent intent = new Intent(getContext(), ProfileActivity.class);
getContext().startActivity(intent); intent.putExtra(ProfileActivity.CONTACT_ID_EXTRA, recipient.getAddress().getDcContactId());
/*
if (recipient.getContactUri() != null) {
ContactsContract.QuickContact.showQuickContact(getContext(), AvatarImageView.this, recipient.getContactUri(), ContactsContract.QuickContact.MODE_LARGE, null);
} else {
final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
if (recipient.getAddress().isEmail()) {
intent.putExtra(ContactsContract.Intents.Insert.EMAIL, recipient.getAddress().toEmailString());
} else {
intent.putExtra(ContactsContract.Intents.Insert.PHONE, recipient.getAddress().toPhoneString());
}
intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
getContext().startActivity(intent); getContext().startActivity(intent);
} }
*/
}); });
} else { } else {
super.setOnClickListener(listener); super.setOnClickListener(listener);