author | Nikita Kozlov <nikita@elyzion.net> |
Sat, 05 Nov 2011 23:49:30 +0100 | |
changeset 956 | 6b30719f4de6 |
parent 955 | 319ce14e4826 |
child 958 | f78522cede87 |
permissions | -rw-r--r-- |
577 | 1 |
/* |
567 | 2 |
BEEM is a videoconference application on the Android Platform. |
3 |
||
4 |
Copyright (C) 2009 by Frederic-Charles Barthelery, |
|
5 |
Jean-Manuel Da Silva, |
|
6 |
Nikita Kozlov, |
|
7 |
Philippe Lago, |
|
8 |
Jean Baptiste Vergely, |
|
577 | 9 |
Vincent Veronis. |
567 | 10 |
|
11 |
This file is part of BEEM. |
|
12 |
||
13 |
BEEM is free software: you can redistribute it and/or modify |
|
14 |
it under the terms of the GNU General Public License as published by |
|
15 |
the Free Software Foundation, either version 3 of the License, or |
|
16 |
(at your option) any later version. |
|
17 |
||
18 |
BEEM is distributed in the hope that it will be useful, |
|
19 |
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
20 |
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
21 |
GNU General Public License for more details. |
|
22 |
||
23 |
You should have received a copy of the GNU General Public License |
|
24 |
along with BEEM. If not, see <http://www.gnu.org/licenses/>. |
|
25 |
||
26 |
Please send bug reports with examples or suggestions to |
|
27 |
contact@beem-project.com or http://dev.beem-project.com/ |
|
28 |
||
577 | 29 |
Epitech, hereby disclaims all copyright interest in the program "Beem" |
567 | 30 |
written by Frederic-Charles Barthelery, |
31 |
Jean-Manuel Da Silva, |
|
32 |
Nikita Kozlov, |
|
33 |
Philippe Lago, |
|
34 |
Jean Baptiste Vergely, |
|
35 |
Vincent Veronis. |
|
36 |
||
37 |
Nicolas Sadirac, November 26, 2009 |
|
38 |
President of Epitech. |
|
39 |
||
40 |
Flavien Astraud, November 26, 2009 |
|
41 |
Head of the EIP Laboratory. |
|
42 |
||
956
6b30719f4de6
merge otr repo with trunk
Nikita Kozlov <nikita@elyzion.net>
parents:
955
diff
changeset
|
43 |
*/ |
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
44 |
package com.beem.project.beem.service; |
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
45 |
|
853 | 46 |
import java.io.File; |
47 |
import java.io.FileWriter; |
|
48 |
import java.io.IOException; |
|
219
79ccbe331695
Les conversations sont retenues dans les chats du service.
Da Risk <darisk972@gmail.com>
parents:
186
diff
changeset
|
49 |
import java.util.Collections; |
79ccbe331695
Les conversations sont retenues dans les chats du service.
Da Risk <darisk972@gmail.com>
parents:
186
diff
changeset
|
50 |
import java.util.LinkedList; |
79ccbe331695
Les conversations sont retenues dans les chats du service.
Da Risk <darisk972@gmail.com>
parents:
186
diff
changeset
|
51 |
import java.util.List; |
79ccbe331695
Les conversations sont retenues dans les chats du service.
Da Risk <darisk972@gmail.com>
parents:
186
diff
changeset
|
52 |
|
933
ca323cff3ac9
I have reimplemented the BeemOtrService in a more "centralized" way.
Nikita Kozlov <nikita@mbdsys.com>
parents:
931
diff
changeset
|
53 |
import net.java.otr4j.OtrException; |
931
bcafceecd837
adding otr status listener
Nikita Kozlov <nikita@mbdsys.com>
parents:
928
diff
changeset
|
54 |
import net.java.otr4j.session.SessionID; |
bcafceecd837
adding otr status listener
Nikita Kozlov <nikita@mbdsys.com>
parents:
928
diff
changeset
|
55 |
|
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
56 |
import org.jivesoftware.smack.Chat; |
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
57 |
import org.jivesoftware.smack.XMPPException; |
853 | 58 |
import org.jivesoftware.smack.util.StringUtils; |
928
0ff0059f2ec3
initial commit adding otr to beem, it's based on http://bitbucket.org/romanzadov/beem, with a better beem integration
Nikita Kozlov <nikita@mbdsys.com>
parents:
714
diff
changeset
|
59 |
import org.jivesoftware.smackx.ChatState; |
584
72d9d76900af
Fix many bugs and memory leak
Da Risk <darisk972@gmail.com>
parents:
583
diff
changeset
|
60 |
import org.jivesoftware.smackx.ChatStateListener; |
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
61 |
|
853 | 62 |
import android.os.Environment; |
583
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
63 |
import android.os.RemoteCallbackList; |
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
64 |
import android.os.RemoteException; |
583
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
65 |
import android.util.Log; |
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
66 |
|
933
ca323cff3ac9
I have reimplemented the BeemOtrService in a more "centralized" way.
Nikita Kozlov <nikita@mbdsys.com>
parents:
931
diff
changeset
|
67 |
import com.beem.project.beem.otr.BeemOtrManager; |
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
68 |
import com.beem.project.beem.service.aidl.IChat; |
583
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
69 |
import com.beem.project.beem.service.aidl.IMessageListener; |
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
70 |
|
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
71 |
/** |
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
72 |
* An adapter for smack's Chat class. |
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
73 |
* @author darisk |
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
74 |
*/ |
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
75 |
public class ChatAdapter extends IChat.Stub { |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
76 |
private static final int HISTORY_MAX_SIZE = 50; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
77 |
private static final String TAG = "ChatAdapter"; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
78 |
private static final String PROTOCOL = "XMPP"; |
937 | 79 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
80 |
private final Chat mAdaptee; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
81 |
private final Contact mParticipant; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
82 |
private String mState; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
83 |
private boolean mIsOpen; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
84 |
private final List<Message> mMessages; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
85 |
private final RemoteCallbackList<IMessageListener> mRemoteListeners = new RemoteCallbackList<IMessageListener>(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
86 |
private final MsgListener mMsgListener = new MsgListener(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
87 |
private SessionID mOtrSessionId; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
88 |
private boolean mIsHistory; |
882 | 89 |
private File mHistoryPath; |
853 | 90 |
private String mAccountUser; |
474 | 91 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
92 |
/** |
940 | 93 |
* Constructor. |
94 |
* @param chat The chat to adapt |
|
95 |
*/ |
|
96 |
public ChatAdapter(final Chat chat) { |
|
97 |
mAdaptee = chat; |
|
98 |
mParticipant = new Contact(chat.getParticipant()); |
|
99 |
mMessages = new LinkedList<Message>(); |
|
100 |
mAdaptee.addMessageListener(mMsgListener); |
|
101 |
} |
|
451 | 102 |
|
940 | 103 |
/** |
104 |
* {@inheritDoc} |
|
105 |
*/ |
|
106 |
@Override |
|
107 |
public Contact getParticipant() throws RemoteException { |
|
108 |
return mParticipant; |
|
109 |
} |
|
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
110 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
111 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
112 |
* {@inheritDoc} |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
113 |
*/ |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
114 |
@Override |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
115 |
public void sendMessage(com.beem.project.beem.service.Message message) throws RemoteException { |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
116 |
com.beem.project.beem.service.Message encrypted = otrEncryptMessage(message); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
117 |
if (encrypted != null) { |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
118 |
transferMessage(encrypted); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
119 |
} else { |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
120 |
transferMessage(message); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
121 |
} |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
122 |
addMessage(message); |
945
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
123 |
} |
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
124 |
|
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
125 |
/** |
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
126 |
* private method for sending message. |
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
127 |
* @param message the message to send |
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
128 |
* @param log do we want to log (in memory and history) the message? |
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
129 |
*/ |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
130 |
private void transferMessage(com.beem.project.beem.service.Message message) { |
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
131 |
org.jivesoftware.smack.packet.Message send = new org.jivesoftware.smack.packet.Message(); |
938 | 132 |
String msgBody = message.getBody(); |
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
133 |
send.setTo(message.getTo()); |
938 | 134 |
Log.w(TAG, "message to " + message.getTo()); |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
135 |
send.setBody(msgBody); |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
136 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
137 |
send.setThread(message.getThread()); |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
138 |
send.setSubject(message.getSubject()); |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
139 |
send.setType(org.jivesoftware.smack.packet.Message.Type.chat); |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
140 |
// TODO gerer les messages contenant des XMPPError |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
141 |
// send.set |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
142 |
try { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
143 |
mAdaptee.sendMessage(send); |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
144 |
} catch (XMPPException e) { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
145 |
e.printStackTrace(); |
928
0ff0059f2ec3
initial commit adding otr to beem, it's based on http://bitbucket.org/romanzadov/beem, with a better beem integration
Nikita Kozlov <nikita@mbdsys.com>
parents:
714
diff
changeset
|
146 |
} |
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
147 |
} |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
148 |
|
941 | 149 |
/** |
150 |
* send message. |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
151 |
* @param msg to send. |
941 | 152 |
*/ |
953
7552d41aebec
add a function to inject xmpp messages
Nikita Kozlov <nikita@beem-project.com>
parents:
951
diff
changeset
|
153 |
public void injectMessage(String msg) { |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
154 |
Message msgToSend = new Message(mParticipant.getJIDWithRes(), Message.MSG_TYPE_CHAT); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
155 |
msgToSend.setBody(msg); |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
156 |
transferMessage(msgToSend); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
157 |
} |
583
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
158 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
159 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
160 |
* {@inheritDoc} |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
161 |
*/ |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
162 |
@Override |
583
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
163 |
public void addMessageListener(IMessageListener listen) { |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
164 |
if (listen != null) |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
165 |
mRemoteListeners.register(listen); |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
166 |
} |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
167 |
|
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
168 |
/** |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
169 |
* {@inheritDoc} |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
170 |
*/ |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
171 |
@Override |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
172 |
public void removeMessageListener(IMessageListener listen) { |
584
72d9d76900af
Fix many bugs and memory leak
Da Risk <darisk972@gmail.com>
parents:
583
diff
changeset
|
173 |
if (listen != null) { |
583
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
174 |
mRemoteListeners.unregister(listen); |
937 | 175 |
} |
583
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
176 |
} |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
177 |
|
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
178 |
/** |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
179 |
* {@inheritDoc} |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
180 |
*/ |
ca7bec1b5754
Add methods for managing MessageListeners in the Chat adapter.
Da Risk <darisk972@gmail.com>
parents:
577
diff
changeset
|
181 |
@Override |
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
182 |
public String getState() throws RemoteException { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
183 |
return mState; |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
184 |
} |
119
c93e4b69f031
Correction de bug sur la reception de messages
Da Risk <darisk972@gmail.com>
parents:
118
diff
changeset
|
185 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
186 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
187 |
* {@inheritDoc} |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
188 |
*/ |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
189 |
@Override |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
190 |
public void setState(String state) throws RemoteException { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
191 |
mState = state; |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
192 |
} |
99 | 193 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
194 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
195 |
* Get the adaptee for the Chat. |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
196 |
* @return The real chat object |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
197 |
*/ |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
198 |
public Chat getAdaptee() { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
199 |
return mAdaptee; |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
200 |
} |
186 | 201 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
202 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
203 |
* {@inheritDoc} |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
204 |
*/ |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
205 |
@Override |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
206 |
public void setOpen(boolean isOpen) { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
207 |
this.mIsOpen = isOpen; |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
208 |
} |
219
79ccbe331695
Les conversations sont retenues dans les chats du service.
Da Risk <darisk972@gmail.com>
parents:
186
diff
changeset
|
209 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
210 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
211 |
* {@inheritDoc} |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
212 |
*/ |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
213 |
@Override |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
214 |
public boolean isOpen() { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
215 |
return mIsOpen; |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
216 |
} |
186 | 217 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
218 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
219 |
* {@inheritDoc} |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
220 |
*/ |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
221 |
@Override |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
222 |
public List<Message> getMessages() throws RemoteException { |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
223 |
return Collections.unmodifiableList(mMessages); |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
224 |
} |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
225 |
|
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
226 |
/** |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
227 |
* Add a message in the chat history. |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
228 |
* @param msg the message to add |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
229 |
*/ |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
230 |
private void addMessage(Message msg) { |
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
231 |
if (mMessages.size() == HISTORY_MAX_SIZE) |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
232 |
mMessages.remove(0); |
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
233 |
mMessages.add(msg); |
853 | 234 |
if (!"".equals(msg.getBody()) && msg.getBody() != null) { |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
235 |
logMessage(msg); |
853 | 236 |
} |
503
93e5d2d9953f
Le formatter a encore frappé.
Jean-Manuel ¨dasilvj¨ Da Silva
parents:
501
diff
changeset
|
237 |
} |
219
79ccbe331695
Les conversations sont retenues dans les chats du service.
Da Risk <darisk972@gmail.com>
parents:
186
diff
changeset
|
238 |
|
588 | 239 |
/** |
854 | 240 |
* Save message in SDCard. |
853 | 241 |
* @param msg the message receive |
854 | 242 |
* @param contactName the name of the contact |
855 | 243 |
*/ |
853 | 244 |
public void saveHistory(Message msg, String contactName) { |
882 | 245 |
File path = getHistoryPath(); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
246 |
File filepath; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
247 |
if (contactName.equals(msg.getFrom())) |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
248 |
filepath = new File(path, StringUtils.parseBareAddress(contactName)); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
249 |
else |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
250 |
filepath = new File(path, StringUtils.parseBareAddress(msg.getTo())); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
251 |
path.mkdirs(); |
882 | 252 |
try { |
253 |
FileWriter file = new FileWriter(filepath, true); |
|
254 |
String log = msg.getTimestamp() + " " + contactName + " " + msg.getBody() |
|
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
255 |
+ System.getProperty("line.separator"); |
882 | 256 |
file.write(log); |
257 |
file.close(); |
|
258 |
} catch (IOException e) { |
|
259 |
Log.e(TAG, "Error writing chat history", e); |
|
937 | 260 |
} |
853 | 261 |
} |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
262 |
|
853 | 263 |
/** |
882 | 264 |
* set History enable/disable. |
855 | 265 |
* @param isHisory history state |
853 | 266 |
*/ |
882 | 267 |
public void setHistory(boolean isHisory) { |
268 |
this.mIsHistory = isHisory; |
|
853 | 269 |
} |
270 |
||
271 |
/** |
|
854 | 272 |
* get History state. |
273 |
* @return mIsHistory |
|
853 | 274 |
*/ |
882 | 275 |
public boolean getHistory() { |
276 |
return mIsHistory; |
|
853 | 277 |
} |
278 |
||
854 | 279 |
/** |
280 |
* Set Account user name. |
|
281 |
* @param accountUser user name |
|
282 |
*/ |
|
853 | 283 |
public void setAccountUser(String accountUser) { |
284 |
mAccountUser = accountUser; |
|
285 |
} |
|
854 | 286 |
|
287 |
/** |
|
288 |
* get Account user name. |
|
289 |
* @return mAccountUser |
|
290 |
*/ |
|
853 | 291 |
public String getAccountUser() { |
292 |
return mAccountUser; |
|
293 |
} |
|
854 | 294 |
|
853 | 295 |
/** |
884 | 296 |
* set History path. |
297 |
* @param historyPath history path |
|
882 | 298 |
*/ |
884 | 299 |
public void setHistoryPath(File historyPath) { |
300 |
this.mHistoryPath = historyPath; |
|
882 | 301 |
} |
302 |
||
303 |
/** |
|
884 | 304 |
* get History path. |
882 | 305 |
* @return mHistoryPath; |
306 |
*/ |
|
307 |
public File getHistoryPath() { |
|
308 |
return mHistoryPath; |
|
309 |
} |
|
310 |
||
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
311 |
private void logMessage(com.beem.project.beem.service.Message message) { |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
312 |
String state = Environment.getExternalStorageState(); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
313 |
if (mIsHistory && Environment.MEDIA_MOUNTED.equals(state)) |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
314 |
saveHistory(message, mAccountUser); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
315 |
|
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
316 |
} |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
317 |
|
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
318 |
private com.beem.project.beem.service.Message otrEncryptMessage(com.beem.project.beem.service.Message unencrypted) { |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
319 |
|
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
320 |
if (mOtrSessionId != null && unencrypted != null && unencrypted.getBody() != null) { |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
321 |
try { |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
322 |
String body = BeemOtrManager.getInstance().getOtrManager().transformSending(mOtrSessionId, unencrypted.getBody()); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
323 |
Message result = new Message(unencrypted.getTo(), unencrypted.getType()); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
324 |
result.setBody(body); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
325 |
return result; |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
326 |
} catch (OtrException e) { |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
327 |
Log.e(TAG, "OTR: Unable to encrypt message", e); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
328 |
} |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
329 |
} |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
330 |
return null; |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
331 |
} |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
332 |
|
882 | 333 |
/** |
588 | 334 |
* Listener. |
335 |
*/ |
|
704
e310d3275d5d
Finish reception of Chat State message.
Da Risk <darisk972@gmail.com>
parents:
622
diff
changeset
|
336 |
private class MsgListener implements ChatStateListener { |
937 | 337 |
/** |
599 | 338 |
* Constructor. |
584
72d9d76900af
Fix many bugs and memory leak
Da Risk <darisk972@gmail.com>
parents:
583
diff
changeset
|
339 |
*/ |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
340 |
public MsgListener() { |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
341 |
} |
937 | 342 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
343 |
@Override |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
344 |
public void processMessage(Chat chat, org.jivesoftware.smack.packet.Message message) { |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
345 |
Message msg = new Message(message); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
346 |
Log.d(TAG, "new msg " + msg.getBody()); |
945
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
347 |
String body; |
937 | 348 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
349 |
if (mOtrSessionId != null) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
350 |
try { |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
351 |
body = BeemOtrManager.getInstance().getOtrManager() |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
352 |
.transformReceiving(mOtrSessionId, msg.getBody()); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
353 |
msg.setBody(body); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
354 |
} catch (OtrException e) { |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
355 |
Log.w(TAG, "Unable to decrypt OTR message", e); |
937 | 356 |
} |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
357 |
} |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
358 |
//TODO add que les message pas de type errors |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
359 |
ChatAdapter.this.addMessage(msg); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
360 |
final int n = mRemoteListeners.beginBroadcast(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
361 |
for (int i = 0; i < n; i++) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
362 |
IMessageListener listener = mRemoteListeners.getBroadcastItem(i); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
363 |
try { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
364 |
if (listener != null) |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
365 |
listener.processMessage(ChatAdapter.this, msg); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
366 |
} catch (RemoteException e) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
367 |
Log.w(TAG, "Error while diffusing message to listener", e); |
937 | 368 |
} |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
369 |
} |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
370 |
mRemoteListeners.finishBroadcast(); |
937 | 371 |
} |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
372 |
|
937 | 373 |
/** |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
374 |
* {@inheritDoc} |
931
bcafceecd837
adding otr status listener
Nikita Kozlov <nikita@mbdsys.com>
parents:
928
diff
changeset
|
375 |
*/ |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
376 |
@Override |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
377 |
public void stateChanged(Chat chat, ChatState state) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
378 |
mState = state.name(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
379 |
final int n = mRemoteListeners.beginBroadcast(); |
931
bcafceecd837
adding otr status listener
Nikita Kozlov <nikita@mbdsys.com>
parents:
928
diff
changeset
|
380 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
381 |
for (int i = 0; i < n; i++) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
382 |
IMessageListener listener = mRemoteListeners.getBroadcastItem(i); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
383 |
try { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
384 |
listener.stateChanged(ChatAdapter.this); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
385 |
} catch (RemoteException e) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
386 |
Log.w(TAG, e.getMessage()); |
931
bcafceecd837
adding otr status listener
Nikita Kozlov <nikita@mbdsys.com>
parents:
928
diff
changeset
|
387 |
} |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
388 |
} |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
389 |
mRemoteListeners.finishBroadcast(); |
928
0ff0059f2ec3
initial commit adding otr to beem, it's based on http://bitbucket.org/romanzadov/beem, with a better beem integration
Nikita Kozlov <nikita@mbdsys.com>
parents:
714
diff
changeset
|
390 |
} |
937 | 391 |
|
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
392 |
} |
937 | 393 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
394 |
/** |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
395 |
* This method is executed when the otr session status change. |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
396 |
* @param otrState the new state of otr session. |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
397 |
*/ |
945
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
398 |
public void otrStateChanged(final String otrState) { |
954
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
399 |
Message m = new Message(null, Message.MSG_TYPE_INFO); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
400 |
m.setBody(otrState); |
b659da60d81e
Show encryption status in the chat message list.
Da Risk <da_risk@beem-project.com>
parents:
953
diff
changeset
|
401 |
addMessage(m); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
402 |
final int n = mRemoteListeners.beginBroadcast(); |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
403 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
404 |
for (int i = 0; i < n; i++) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
405 |
IMessageListener listener = mRemoteListeners.getBroadcastItem(i); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
406 |
try { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
407 |
listener.otrStateChanged(otrState); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
408 |
} catch (RemoteException e) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
409 |
Log.w(TAG, e.getMessage()); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
410 |
} |
928
0ff0059f2ec3
initial commit adding otr to beem, it's based on http://bitbucket.org/romanzadov/beem, with a better beem integration
Nikita Kozlov <nikita@mbdsys.com>
parents:
714
diff
changeset
|
411 |
} |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
412 |
mRemoteListeners.finishBroadcast(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
413 |
} |
937 | 414 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
415 |
@Override |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
416 |
public void startOtrSession() throws RemoteException { |
950
211f45e7bbd3
listen by default for incoming otr session
Nikita Kozlov <nikita@beem-project.com>
parents:
947
diff
changeset
|
417 |
if (mOtrSessionId == null) { |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
418 |
mOtrSessionId = new SessionID(mAccountUser, mParticipant.getJIDWithRes(), PROTOCOL); |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
419 |
BeemOtrManager.getInstance().addChat(mOtrSessionId, this); |
950
211f45e7bbd3
listen by default for incoming otr session
Nikita Kozlov <nikita@beem-project.com>
parents:
947
diff
changeset
|
420 |
} |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
421 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
422 |
try { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
423 |
BeemOtrManager.getInstance().getOtrManager().startSession(mOtrSessionId); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
424 |
} catch (OtrException e) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
425 |
mOtrSessionId = null; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
426 |
e.printStackTrace(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
427 |
throw new RemoteException(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
428 |
} |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
429 |
} |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
430 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
431 |
@Override |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
432 |
public void endOtrSession() throws RemoteException { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
433 |
try { |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
434 |
localEndOtrSession(); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
435 |
} catch (OtrException e) { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
436 |
e.printStackTrace(); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
437 |
throw new RemoteException(); |
937 | 438 |
} |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
439 |
} |
945
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
440 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
441 |
/** |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
442 |
* end an Otr session. |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
443 |
* @return false if something bad happened. |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
444 |
*/ |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
445 |
public boolean localEndOtrSession() throws OtrException { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
446 |
if (mOtrSessionId == null) |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
447 |
return true; |
945
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
448 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
449 |
BeemOtrManager.getInstance().getOtrManager().endSession(mOtrSessionId); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
450 |
BeemOtrManager.getInstance().removeChat(mOtrSessionId); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
451 |
mOtrSessionId = null; |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
452 |
listenOtrSession(); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
453 |
return true; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
454 |
} |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
455 |
|
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
456 |
public void listenOtrSession() { |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
457 |
if (mOtrSessionId != null) |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
458 |
return; |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
459 |
|
950
211f45e7bbd3
listen by default for incoming otr session
Nikita Kozlov <nikita@beem-project.com>
parents:
947
diff
changeset
|
460 |
mOtrSessionId = new SessionID(mAccountUser, mParticipant.getJIDWithRes(), PROTOCOL); |
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
461 |
BeemOtrManager.getInstance().addChat(mOtrSessionId, this); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
462 |
//OtrEngineImpl will make a call to "this.getSession(sessionID)" which will instantiate our session. |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
463 |
BeemOtrManager.getInstance().getOtrManager().getSessionStatus(mOtrSessionId); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
464 |
} |
934
bf953743f5a1
rewrite BeemOtrManager as a singleton and merge it with BeemOtrEngineHostImpl
Nikita Kozlov <nikita@mbdsys.com>
parents:
933
diff
changeset
|
465 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
466 |
@Override |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
467 |
public String getLocalOtrFingerprint() throws RemoteException { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
468 |
if (mOtrSessionId == null) |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
469 |
return null; |
945
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
470 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
471 |
return BeemOtrManager.getInstance().getLocalFingerprint(mOtrSessionId); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
472 |
} |
937 | 473 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
474 |
@Override |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
475 |
public String getRemoteOtrFingerprint() throws RemoteException { |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
476 |
if (mOtrSessionId == null) |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
477 |
return null; |
945
c2eb19cd7032
fix otr message in history
Nikita Kozlov <nikita@beem-project.com>
parents:
943
diff
changeset
|
478 |
|
943
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
479 |
return BeemOtrManager.getInstance().getRemoteFingerprint(mOtrSessionId); |
ab30d289a86c
adding a keystore for otr, adding buttons which display fingerprints
Nikita Kozlov <nikita@beem-project.com>
parents:
942
diff
changeset
|
480 |
} |
947
5441ea00c4f1
check otr status when openning a new chat
Nikita Kozlov <nikita@beem-project.com>
parents:
945
diff
changeset
|
481 |
|
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
482 |
@Override |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
483 |
public void verifyRemoteFingerprint(boolean ok) { |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
484 |
if (mOtrSessionId != null) { |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
485 |
if (ok) |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
486 |
BeemOtrManager.getInstance().verifyRemoteFingerprint(mOtrSessionId); |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
487 |
else |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
488 |
BeemOtrManager.getInstance().unverifyRemoteFingerprint(mOtrSessionId); |
947
5441ea00c4f1
check otr status when openning a new chat
Nikita Kozlov <nikita@beem-project.com>
parents:
945
diff
changeset
|
489 |
} |
951
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
490 |
} |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
491 |
|
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
492 |
@Override |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
493 |
public String getOtrStatus() throws RemoteException { |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
494 |
if (mOtrSessionId == null) |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
495 |
return null; |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
496 |
return BeemOtrManager.getInstance().getOtrManager().getSessionStatus(mOtrSessionId).toString(); |
a4bbcfbd0a91
managing otr fingerprint authentication
Nikita Kozlov <nikita@beem-project.com>
parents:
950
diff
changeset
|
497 |
} |
55
66732dd2cb77
Add an interface for sending im message.
Da Risk <darisk972@gmail.com>
parents:
diff
changeset
|
498 |
} |