mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 09:49:21 +02:00
don't enlage email chats avatar placeholder
This commit is contained in:
parent
a280407370
commit
cc64142e7b
2 changed files with 3 additions and 2 deletions
|
@ -4,6 +4,7 @@
|
||||||
|
|
||||||
* hide contact email addresses in search results
|
* hide contact email addresses in search results
|
||||||
* disable non-functional message editing and ephemeral messages timer settings in classic email thread chat
|
* disable non-functional message editing and ephemeral messages timer settings in classic email thread chat
|
||||||
|
* don't enlage email chats avatar placeholder
|
||||||
|
|
||||||
## v2.8.0
|
## v2.8.0
|
||||||
|
|
||||||
|
|
|
@ -329,7 +329,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
|
||||||
|
|
||||||
File file = new File(profileImagePath);
|
File file = new File(profileImagePath);
|
||||||
|
|
||||||
if (file.exists()) {
|
if (chatIsEncrypted && file.exists()) {
|
||||||
profileImageUri = Uri.fromFile(file);
|
profileImageUri = Uri.fromFile(file);
|
||||||
String type = "image/" + profileImagePath.substring(profileImagePath.lastIndexOf(".") + 1);
|
String type = "image/" + profileImagePath.substring(profileImagePath.lastIndexOf(".") + 1);
|
||||||
|
|
||||||
|
@ -338,7 +338,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
|
||||||
intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title);
|
intent.putExtra(MediaPreviewActivity.ACTIVITY_TITLE_EXTRA, title);
|
||||||
intent.putExtra( // show edit-button, if the user is allowed to edit the name/avatar
|
intent.putExtra( // show edit-button, if the user is allowed to edit the name/avatar
|
||||||
MediaPreviewActivity.EDIT_AVATAR_CHAT_ID,
|
MediaPreviewActivity.EDIT_AVATAR_CHAT_ID,
|
||||||
(chatIsMultiUser && chatIsEncrypted && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0
|
(chatIsMultiUser && !chatIsInBroadcast && !chatIsMailingList) ? chatId : 0
|
||||||
);
|
);
|
||||||
startActivity(intent);
|
startActivity(intent);
|
||||||
} else if (chatIsMultiUser){
|
} else if (chatIsMultiUser){
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue