forked from cwtch.im/cwtch-ui
Erinn Comment Fixups
This commit is contained in:
parent
c5c0f21829
commit
066b4d4dec
|
@ -133,10 +133,10 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
|
||||||
notificationManager.notify(dlID, newNotification);
|
notificationManager.notify(dlID, newNotification);
|
||||||
}
|
}
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
Log.i("FlwtchWorker->FileDownloadProgressUpdate", e.toString() + " :: " + e.getStackTrace());
|
Log.d("FlwtchWorker->FileDownloadProgressUpdate", e.toString() + " :: " + e.getStackTrace());
|
||||||
}
|
}
|
||||||
} else if (evt.EventType == "FileDownloaded") {
|
} else if (evt.EventType == "FileDownloaded") {
|
||||||
Log.i("FlwtchWorker", "file downloaded!");
|
Log.d("FlwtchWorker", "file downloaded!");
|
||||||
val data = JSONObject(evt.Data);
|
val data = JSONObject(evt.Data);
|
||||||
val tempFile = data.getString("TempFile");
|
val tempFile = data.getString("TempFile");
|
||||||
val fileKey = data.getString("FileKey");
|
val fileKey = data.getString("FileKey");
|
||||||
|
@ -147,7 +147,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
|
||||||
val targetUri = Uri.parse(filePath);
|
val targetUri = Uri.parse(filePath);
|
||||||
val os = this.applicationContext.getContentResolver().openOutputStream(targetUri);
|
val os = this.applicationContext.getContentResolver().openOutputStream(targetUri);
|
||||||
val bytesWritten = Files.copy(sourcePath, os);
|
val bytesWritten = Files.copy(sourcePath, os);
|
||||||
Log.i("FlwtchWorker", "copied " + bytesWritten.toString() + " bytes");
|
Log.d("FlwtchWorker", "copied " + bytesWritten.toString() + " bytes");
|
||||||
if (bytesWritten != 0L) {
|
if (bytesWritten != 0L) {
|
||||||
os?.flush();
|
os?.flush();
|
||||||
os?.close();
|
os?.close();
|
||||||
|
@ -184,7 +184,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
|
||||||
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()
|
||||||
val indexI = a.getInt("index").toLong()
|
val indexI = a.getInt("index").toLong()
|
||||||
Log.i("FlwtchWorker", "Cwtch GetMessage " + profile + " " + conversation.toString() + " " + indexI.toString())
|
Log.d("FlwtchWorker", "Cwtch GetMessage " + profile + " " + conversation.toString() + " " + indexI.toString())
|
||||||
return Result.success(Data.Builder().putString("result", Cwtch.getMessage(profile, conversation, indexI)).build())
|
return Result.success(Data.Builder().putString("result", Cwtch.getMessage(profile, conversation, indexI)).build())
|
||||||
}
|
}
|
||||||
"GetMessageByID" -> {
|
"GetMessageByID" -> {
|
||||||
|
|
|
@ -30,7 +30,6 @@ import android.os.Build
|
||||||
import android.os.Environment
|
import android.os.Environment
|
||||||
import android.database.Cursor
|
import android.database.Cursor
|
||||||
import android.provider.MediaStore
|
import android.provider.MediaStore
|
||||||
import cwtch.Cwtch
|
|
||||||
|
|
||||||
class MainActivity: FlutterActivity() {
|
class MainActivity: FlutterActivity() {
|
||||||
override fun provideSplashScreen(): SplashScreen? = SplashView()
|
override fun provideSplashScreen(): SplashScreen? = SplashView()
|
||||||
|
@ -148,11 +147,6 @@ class MainActivity: FlutterActivity() {
|
||||||
// that we can divert this method call to ReconnectCwtchForeground instead if so.
|
// that we can divert this method call to ReconnectCwtchForeground instead if so.
|
||||||
val works = WorkManager.getInstance(this).getWorkInfosByTag(WORKER_TAG).get()
|
val works = WorkManager.getInstance(this).getWorkInfosByTag(WORKER_TAG).get()
|
||||||
for (workInfo in works) {
|
for (workInfo in works) {
|
||||||
Log.i("handleCwtch:WorkManager", "$workInfo")
|
|
||||||
if (!workInfo.tags.contains(uniqueTag)) {
|
|
||||||
Log.i("handleCwtch:WorkManager", "canceling ${workInfo.id} bc tags don't include $uniqueTag")
|
|
||||||
WorkManager.getInstance(this).cancelWorkById(workInfo.id)
|
|
||||||
}
|
|
||||||
WorkManager.getInstance(this).cancelWorkById(workInfo.id)
|
WorkManager.getInstance(this).cancelWorkById(workInfo.id)
|
||||||
}
|
}
|
||||||
WorkManager.getInstance(this).pruneWork()
|
WorkManager.getInstance(this).pruneWork()
|
||||||
|
|
|
@ -166,7 +166,7 @@ class CwtchNotifier {
|
||||||
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(conversation);
|
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(conversation);
|
||||||
// We return -1 for protocol message acks if there is no message
|
// We return -1 for protocol message acks if there is no message
|
||||||
if (messageID == -1) break;
|
if (messageID == -1) break;
|
||||||
var key = contact!.getMessageKeyOrFail(conversation, messageID, contact.lastMessageTime);
|
var key = contact!.getMessageKeyOrFail(conversation, messageID);
|
||||||
if (key == null) break;
|
if (key == null) break;
|
||||||
try {
|
try {
|
||||||
var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
|
var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
|
||||||
|
@ -217,7 +217,8 @@ class CwtchNotifier {
|
||||||
notificationManager.notify("New Message From Group!");
|
notificationManager.notify("New Message From Group!");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// This is not dealt with by IndexedAcknowledgment
|
// This is dealt with by IndexedAcknowledgment
|
||||||
|
EnvironmentConfig.debugLog("new message from group from yourself - this should not happen");
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case "SendMessageToPeerError":
|
case "SendMessageToPeerError":
|
||||||
|
@ -226,7 +227,7 @@ class CwtchNotifier {
|
||||||
case "IndexedFailure":
|
case "IndexedFailure":
|
||||||
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"]);
|
var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.findContact(data["RemotePeer"]);
|
||||||
var idx = int.parse(data["Index"]);
|
var idx = int.parse(data["Index"]);
|
||||||
var key = contact?.getMessageKeyOrFail(contact.identifier, idx, contact.lastMessageTime);
|
var key = contact?.getMessageKeyOrFail(contact.identifier, idx);
|
||||||
if (key != null) {
|
if (key != null) {
|
||||||
var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
|
var message = Provider.of<MessageMetadata>(key.currentContext!, listen: false);
|
||||||
message.error = true;
|
message.error = true;
|
||||||
|
@ -301,7 +302,6 @@ class CwtchNotifier {
|
||||||
break;
|
break;
|
||||||
case "ServerStateChange":
|
case "ServerStateChange":
|
||||||
// Update the Server Cache
|
// Update the Server Cache
|
||||||
//EnvironmentConfig.debugLog("server state changes $data");
|
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.updateServerStatusCache(data["GroupServer"], data["ConnectionState"]);
|
profileCN.getProfile(data["ProfileOnion"])?.updateServerStatusCache(data["GroupServer"], data["ConnectionState"]);
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.contacts.forEach((contact) {
|
profileCN.getProfile(data["ProfileOnion"])?.contactList.contacts.forEach((contact) {
|
||||||
if (contact.isGroup == true && contact.server == data["GroupServer"]) {
|
if (contact.isGroup == true && contact.server == data["GroupServer"]) {
|
||||||
|
|
|
@ -667,9 +667,8 @@ class ContactInfoState extends ChangeNotifier {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
GlobalKey<MessageRowState> getMessageKey(int conversation, int message, DateTime lastread) {
|
GlobalKey<MessageRowState> getMessageKey(int conversation, int message) {
|
||||||
String index = "c: " + conversation.toString() + " m:" + message.toString(); //+ " lr:" +lastMessageTime.toIso8601String();
|
String index = "c: " + conversation.toString() + " m:" + message.toString();
|
||||||
//EnvironmentConfig.debugLog("looked up key $index");
|
|
||||||
if (keys[index] == null) {
|
if (keys[index] == null) {
|
||||||
keys[index] = GlobalKey<MessageRowState>();
|
keys[index] = GlobalKey<MessageRowState>();
|
||||||
}
|
}
|
||||||
|
@ -677,8 +676,8 @@ class ContactInfoState extends ChangeNotifier {
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
GlobalKey<MessageRowState>? getMessageKeyOrFail(int conversation, int message, DateTime lastread) {
|
GlobalKey<MessageRowState>? getMessageKeyOrFail(int conversation, int message) {
|
||||||
String index = "c: " + conversation.toString() + " m:" + message.toString(); // + " lr:" +lastMessageTime.toIso8601String();
|
String index = "c: " + conversation.toString() + " m:" + message.toString();
|
||||||
|
|
||||||
if (keys[index] == null) {
|
if (keys[index] == null) {
|
||||||
return null;
|
return null;
|
||||||
|
|
|
@ -84,7 +84,7 @@ class _MessageListState extends State<MessageList> {
|
||||||
builder: (context, snapshot) {
|
builder: (context, snapshot) {
|
||||||
if (snapshot.hasData) {
|
if (snapshot.hasData) {
|
||||||
var message = snapshot.data as Message;
|
var message = snapshot.data as Message;
|
||||||
var key = Provider.of<ContactInfoState>(outerContext, listen: false).getMessageKey(contactHandle, message.getMetadata().messageID, DateTime.now());
|
var key = Provider.of<ContactInfoState>(outerContext, listen: false).getMessageKey(contactHandle, message.getMetadata().messageID);
|
||||||
return message.getWidget(context, key);
|
return message.getWidget(context, key);
|
||||||
} else {
|
} else {
|
||||||
return MessageLoadingBubble();
|
return MessageLoadingBubble();
|
||||||
|
|
Loading…
Reference in New Issue