Skip to content

Commit 28b08d7

Browse files
committed
first simple Shark Net Channel test works
1 parent ab2b3b2 commit 28b08d7

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

app/src/main/java/net/sharksystem/asap/sharknet/android/SNChannelViewContentAdapter.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,23 +131,23 @@ public static SharkNetMessage parseMessage(byte[] message, String sender, String
131131
recipients2View = sb.toString();
132132
}
133133

134-
CharSequence encrypted2View = "E2E encrypted: no";
134+
CharSequence encrypted2View = "not E2E encrypted";
135135
if(snMessage.encrypted()) {
136-
encrypted2View = "E2E encrypted: yes";
136+
encrypted2View = "is E2E encrypted";
137137
}
138138

139139
// assume defaults at first
140140
CharSequence sender2View = "from: unknown";
141-
CharSequence content2View = "decrypted message";
142-
CharSequence verified2View = "verified: no";
141+
CharSequence content2View = "cannot decrypt message";
142+
CharSequence verified2View = "not verified";
143143
CharSequence timestamp2View = "time: unknown";
144144
CharSequence iA2View = "iA: unknown";
145145

146146

147147
// do we have an decrypted message?
148148
if(snMessage.couldBeDecrypted()) {
149149
byte[] snContent = snMessage.getContent();
150-
content2View = String.valueOf(snContent);
150+
content2View = new String(snContent);
151151

152152
Timestamp creationTime = snMessage.getCreationTime();
153153
timestamp2View = DateTimeHelper.long2DateString(creationTime.getTime());
@@ -164,12 +164,12 @@ public static SharkNetMessage parseMessage(byte[] message, String sender, String
164164
sender2View = "from: " + senderName;
165165

166166
if(snMessage.verified()) {
167-
verified2View = "verified";
167+
verified2View = "is verified";
168168

169169
int identityAssurance = SNChannelsComponent.getSharkNetChannelComponent().
170170
getAsapPKI().getIdentityAssurance(snMessage.getSender());
171171

172-
iA2View = "iA (" + senderName + "): " + identityAssurance;
172+
iA2View = "iA of " + senderName + " is " + identityAssurance;
173173
}
174174
}
175175

app/src/main/java/net/sharksystem/asap/sharknet/android/SNChannelsComponent.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import net.sharksystem.asap.android.apps.ASAPApplicationComponentHelper;
1414
import net.sharksystem.asap.android.apps.ASAPComponentNotYetInitializedException;
1515
import net.sharksystem.asap.android.apps.ASAPMessageReceivedListener;
16+
import net.sharksystem.asap.sharknet.SNMessage;
1617
import net.sharksystem.crypto.BasicKeyStore;
1718
import net.sharksystem.persons.ASAPPKI;
1819
import net.sharksystem.sharknet.android.PersonsStorage;
@@ -174,6 +175,13 @@ private String getLogStart() {
174175

175176
@Override
176177
public CharSequence getPersonName(CharSequence peerID) throws ASAPException {
177-
return this.personsStorage.getPersonName(peerID);
178+
String personName = this.personsStorage.getPersonName(peerID).toString();
179+
// replace special SN symbols
180+
switch(personName) {
181+
case SNMessage.ANONYMOUS: return "unknown";
182+
case SNMessage.ANY_RECIPIENT: return "anybody";
183+
}
184+
185+
return personName;
178186
}
179187
}

0 commit comments

Comments
 (0)