Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bool to disable emoticons in messages + notification for message even if in foreground

Browse source
This commit is contained in:
Sylvain Berfini 2012-07-25 15:24:09 +02:00
parent 8364365a57
commit f1972455e5
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
res/values/non_localizable_custom.xml
View file

@ -12,6 +12,7 @@
<bool name="useFirstLoginActivity">false</bool>
<bool name="disable_animations">false</bool>
<bool name="lock_statusbar">false</bool>
<bool name="emoticons_in_messages">false</bool>
<bool name="only_display_username_if_unknown">true</bool>
<bool name="display_messages_time">true</bool> <!-- Used to show the time of each message arrival -->

4
src/org/linphone/LinphoneActivity.java
View file

@ -428,10 +428,10 @@ public class LinphoneActivity extends FragmentActivity implements OnClickListene
chatFragment.onMessageReceived(from, message);
chatStorage.markMessageAsRead(id);
} else if (LinphoneService.isReady()) {
LinphoneUtils.findUriPictureOfContactAndSetDisplayName(from, getContentResolver());
LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), from.getDisplayName(), message);
displayMissedChats(chatStorage.getUnreadMessageCount());
}
LinphoneUtils.findUriPictureOfContactAndSetDisplayName(from, getContentResolver());
LinphoneService.instance().displayMessageNotification(from.asStringUriOnly(), from.getDisplayName(), message);
}
public void updateMissedChatCount() {

6
src/org/linphone/ui/BubbleChat.java
View file

@ -94,7 +94,11 @@ public class BubbleChat {
TextView messageView = new TextView(context);
messageView.setId(id);
messageView.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT));
messageView.setText(getSmiledText(context, message));
if (context.getResources().getBoolean(R.bool.emoticons_in_messages)) {
messageView.setText(getSmiledText(context, message));
} else {
messageView.setText(message);
}
messageView.setTextColor(Color.BLACK);
view.setId(id);