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

[LIME] new icons incerter

Browse source
This commit is contained in:
Brieuc Viel 2017-03-30 16:43:45 +02:00
parent a04beb1e79
commit 04c8250738
5 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
res/drawable-xhdpi/chat_secure.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 449 B

BIN
res/drawable-xhdpi/chat_unsecure.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 298 B

3
res/layout/chat_bubble.xml
View file

@ -146,7 +146,8 @@
android:layout_alignTop="@id/background" android:layout_alignTop="@id/background"
android:layout_width="15dp" android:layout_width="15dp"
android:layout_height="15dp" android:layout_height="15dp"
android:paddingTop="5dp"> android:paddingTop="5dp"
android:paddingBottom="3dp">
<ImageView <ImageView
android:id="@+id/status" android:id="@+id/status"

12
src/org/linphone/ChatFragment.java
View file

@ -745,7 +745,8 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
dialog.dismiss(); dialog.dismiss();
} }
}); });
dialog.show(); if(LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory)
dialog.show();
} }
private LinphoneChatMessage getMessageForId(int id) { private LinphoneChatMessage getMessageForId(int id) {
@ -1048,7 +1049,7 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
@Override @Override
public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) { public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, State state) {
Log.e(" /////////====>> onLinphoneChatMessageStateChanged - state = "+state.toString());
} }
@Override @Override
@ -1192,10 +1193,11 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
if (status == LinphoneChatMessage.State.InProgress) { if (status == LinphoneChatMessage.State.InProgress) {
holder.messageSendingInProgress.setVisibility(View.VISIBLE); holder.messageSendingInProgress.setVisibility(View.VISIBLE);
} else if (!message.isSecured() && !message.isOutgoing() && }
LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory) { if (!message.isSecured() && !message.isOutgoing() &&
LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory && status != LinphoneChatMessage.State.InProgress) {
holder.messageStatus.setVisibility(View.VISIBLE); holder.messageStatus.setVisibility(View.VISIBLE);
holder.messageStatus.setImageResource(R.drawable.lime_ko); holder.messageStatus.setImageResource(R.drawable.chat_unsecure);
} }
if(status == State.DeliveredToUser && message.isOutgoing()){ if(status == State.DeliveredToUser && message.isOutgoing()){
holder.imdmLayout.setVisibility(View.VISIBLE); holder.imdmLayout.setVisibility(View.VISIBLE);

3
src/org/linphone/LinphoneManager.java
View file

@ -1107,7 +1107,8 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
LinphoneManager.getInstance().setAreDisplayAlertMessage(false); LinphoneManager.getInstance().setAreDisplayAlertMessage(false);
} }
}); });
dialog.show(); if(LinphoneManager.getLc().getLimeEncryption() == LinphoneCore.LinphoneLimeState.Mandatory)
dialog.show();
} }
} catch (Exception e) { } catch (Exception e) {
Log.e(e); Log.e(e);