TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 10:12:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Signal 4.41.0

Browse Source
This commit is contained in:
Niels Andriesse
2019-08-07 16:48:54 +10:00
parent 781a8500df 56c17e32f1
commit 1822e87f7c
584 changed files with 9504 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/org/thoughtcrime/securesms/contactshare/Contact.java
View File

@@ -540,7 +540,7 @@ public class Contact implements Parcelable {
};
@Override
public String toString() {
public @NonNull String toString() {
StringBuilder builder = new StringBuilder();
if (!TextUtils.isEmpty(street)) {
@@ -642,7 +642,7 @@ public class Contact implements Parcelable {
private static Attachment attachmentFromUri(@Nullable Uri uri) {
if (uri == null) return null;
return new UriAttachment(uri, MediaUtil.IMAGE_JPEG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, false, false, null);
return new UriAttachment(uri, MediaUtil.IMAGE_JPEG, AttachmentDatabase.TRANSFER_PROGRESS_DONE, 0, null, false, false, null, null);
}
@Override

6
src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
View File

@@ -39,17 +39,17 @@ class ContactFieldAdapter extends RecyclerView.Adapter<ContactFieldAdapter.Conta
}
@Override
public ContactFieldViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public @NonNull ContactFieldViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new ContactFieldViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_selectable_contact_field, parent, false));
}
@Override
public void onBindViewHolder(ContactFieldViewHolder holder, int position) {
public void onBindViewHolder(@NonNull ContactFieldViewHolder holder, int position) {
holder.bind(fields.get(position), glideRequests, selectable);
}
@Override
public void onViewRecycled(ContactFieldViewHolder holder) {
public void onViewRecycled(@NonNull ContactFieldViewHolder holder) {
holder.recycle();
}

4
src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
View File

@@ -37,14 +37,14 @@ public class ContactShareEditAdapter extends RecyclerView.Adapter<ContactShareEd
}
@Override
public ContactEditViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
public @NonNull ContactEditViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
return new ContactEditViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_editable_contact, parent, false),
locale,
glideRequests);
}
@Override
public void onBindViewHolder(ContactEditViewHolder holder, int position) {
public void onBindViewHolder(@NonNull ContactEditViewHolder holder, int position) {
holder.bind(position, contacts.get(position), eventListener);
}

2
src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
View File

@@ -230,7 +230,7 @@ public class SharedContactDetailsActivity extends PassphraseRequiredActionBarAct
inviteButtonView.setOnClickListener(v -> {
ContactUtil.selectRecipientThroughDialog(this, systemUsers, dynamicLanguage.getCurrentLocale(), recipient -> {
CommunicationActions.composeSmsThroughDefaultApp(this, recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, "https://sgnl.link/1KpeYmF"));
CommunicationActions.composeSmsThroughDefaultApp(this, recipient.getAddress(), getString(R.string.InviteActivity_lets_switch_to_signal, getString(R.string.install_url)));
});
});
} else {