TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-22 16:07:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump version to 4.20.0.

Browse Source
This commit is contained in:
Greyson Parrelli 2018-05-21 17:19:03 -04:00
parent 0449647cf9
commit 5d75f11cbc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -257,8 +257,8 @@ android {
} }
defaultConfig { defaultConfig {
versionCode 357 versionCode 358
versionName "4.19.3" versionName "4.20.0"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 25 targetSdkVersion 25

10
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -428,12 +428,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
break; break;
case PICK_CONTACT: case PICK_CONTACT:
// TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases // TODO(greyson): Re-enable shared contact sending after receiving has been enabled for a few releases
addAttachmentContactInfo(data.getData());
// if (isSecureText && !isSmsForced()) {
// openContactShareEditor(data.getData());
// } else {
// addAttachmentContactInfo(data.getData()); // addAttachmentContactInfo(data.getData());
// } if (isSecureText && !isSmsForced()) {
openContactShareEditor(data.getData());
} else {
addAttachmentContactInfo(data.getData());
}
break; break;
case GET_CONTACT_DETAILS: case GET_CONTACT_DETAILS:
sendSharedContact(data.getParcelableArrayListExtra(ContactShareEditActivity.KEY_CONTACTS)); sendSharedContact(data.getParcelableArrayListExtra(ContactShareEditActivity.KEY_CONTACTS));