IndexFailure + Android Change Password Fixups
This commit is contained in:
parent
d13ded8f50
commit
a6743af103
|
@ -180,6 +180,13 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
|
||||||
val pass = (a.get("pass") as? String) ?: ""
|
val pass = (a.get("pass") as? String) ?: ""
|
||||||
Cwtch.loadProfiles(pass)
|
Cwtch.loadProfiles(pass)
|
||||||
}
|
}
|
||||||
|
"ChangePassword" -> {
|
||||||
|
val profile = (a.get("ProfileOnion") as? String) ?: ""
|
||||||
|
val pass = (a.get("OldPass") as? String) ?: ""
|
||||||
|
val passNew = (a.get("NewPass") as? String) ?: ""
|
||||||
|
val passNew2 = (a.get("NewPassAgain") as? String) ?: ""
|
||||||
|
Cwtch.changePassword(profile, pass, passNew, passNew2)
|
||||||
|
}
|
||||||
"GetMessage" -> {
|
"GetMessage" -> {
|
||||||
val profile = (a.get("ProfileOnion") as? String) ?: ""
|
val profile = (a.get("ProfileOnion") as? String) ?: ""
|
||||||
val conversation = a.getInt("conversation").toLong()
|
val conversation = a.getInt("conversation").toLong()
|
||||||
|
|
|
@ -229,14 +229,9 @@ class CwtchNotifier {
|
||||||
EnvironmentConfig.debugLog("new message from group from yourself - this should not happen");
|
EnvironmentConfig.debugLog("new message from group from yourself - this should not happen");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "SendMessageToPeerError":
|
|
||||||
// Ignore dealt with by IndexedFailure
|
|
||||||
break;
|
|
||||||
case "SendMessageToGroupError":
|
|
||||||
// Ignore dealt with by IndexedFailure
|
|
||||||
break;
|
|
||||||
case "IndexedFailure":
|
case "IndexedFailure":
|
||||||
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"]);
|
var identifier = int.parse(data["ConversationID"]);
|
||||||
|
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
|
||||||
var idx = int.parse(data["Index"]);
|
var idx = int.parse(data["Index"]);
|
||||||
var key = contact?.getMessageKeyOrFail(contact.identifier, idx);
|
var key = contact?.getMessageKeyOrFail(contact.identifier, idx);
|
||||||
if (key != null) {
|
if (key != null) {
|
||||||
|
@ -315,21 +310,6 @@ class CwtchNotifier {
|
||||||
});
|
});
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.resort();
|
profileCN.getProfile(data["ProfileOnion"])?.contactList.resort();
|
||||||
break;
|
break;
|
||||||
case "SetPeerAttribute":
|
|
||||||
if (data["Key"] == "local.name") {
|
|
||||||
if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]) != null) {
|
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.nickname = data["Data"];
|
|
||||||
}
|
|
||||||
} else if (data["Key"] == "local.archived") {
|
|
||||||
if (profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"]) != null) {
|
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(data["RemotePeer"])!.isArchived = data["Data"] == "true";
|
|
||||||
}
|
|
||||||
} else if (data["Key"] == "LastKnowSignature") {
|
|
||||||
// group syncing information that isn't relevant to the UI...
|
|
||||||
} else {
|
|
||||||
EnvironmentConfig.debugLog("unhandled set peer attribute event: ${data['Key']}");
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case "NewRetValMessageFromPeer":
|
case "NewRetValMessageFromPeer":
|
||||||
if (data["Path"] == "profile.name") {
|
if (data["Path"] == "profile.name") {
|
||||||
if (data["Data"].toString().trim().length > 0) {
|
if (data["Data"].toString().trim().length > 0) {
|
||||||
|
|
Loading…
Reference in New Issue