flutter
/
flutter_app
6
1
Fork 0
Code Issues 14 Pull Requests Releases 1 Wiki Activity

support for indexed acks, better group sendmessage handling and group acks, clean up warnings
continuous-integration/drone/pr Build is failing Details

This commit is contained in:
erinn 2021-05-03 11:47:54 -07:00
parent 0116db8dc4
commit 70dc9d690d
13 changed files with 89 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/cwtch/cwtchNotifier.dart
View File

@ -1,9 +1,7 @@
import 'dart:convert';
import 'dart:developer';
import 'package:provider/provider.dart';
import 'package:flutter_app/torstatus.dart';
import 'package:flutter_app/widgets/messagebubble.dart';
import '../errorHandler.dart';
import '../model.dart';
@ -72,9 +70,13 @@ class CwtchNotifier {
Provider.of<MessageState>(key.currentContext, listen: false).ackd = true;
break;
case "NewMessageFromGroup":
profileCN.getProfile(data["ProfileOnion"]).contactList.getContact(data["GroupID"]).unreadMessages++;
profileCN.getProfile(data["ProfileOnion"]).contactList.getContact(data["GroupID"]).totalMessages++;
profileCN.getProfile(data["ProfileOnion"]).contactList.updateLastMessageTime(data["GroupID"], DateTime.now());
if (data["ProfileOnion"] != data["RemotePeer"]) {//not from me
profileCN.getProfile(data["ProfileOnion"]).contactList.getContact(data["GroupID"]).unreadMessages++;
profileCN.getProfile(data["ProfileOnion"]).contactList.getContact(data["GroupID"]).totalMessages++;
profileCN.getProfile(data["ProfileOnion"]).contactList.updateLastMessageTime(data["GroupID"], DateTime.now());
} else {// from me (already displayed - do not update counter)
//todo: update ack - once group messages
}
break;
case "AppError":
print("New App Error: $data");

1
lib/cwtch/ffi.dart
View File

@ -305,6 +305,7 @@ class CwtchFfi implements Cwtch {
// ignore: non_constant_identifier_names
void ResetTor() {
var resetTor = library.lookup<NativeFunction<Void Function()>>("c_ResetTor");
// ignore: non_constant_identifier_names
final ResetTor = resetTor.asFunction<void Function()>();
ResetTor();
}

1
lib/cwtch/gomobile.dart
View File

@ -156,6 +156,7 @@ class CwtchGomobile implements Cwtch {
}
@override
// ignore: non_constant_identifier_names
void SetGroupAttribute(String profileOnion, String groupHandle, String key, String value) {
cwtchPlatform.invokeMethod("SetGroupAttribute", {"ProfileOnion": profileOnion, "groupHandle": groupHandle, "key": key, "value": value});
}

4
lib/main_test.dart
View File

@ -1,4 +1,3 @@
import 'dart:convert';
import 'package:flutter/foundation.dart';
import 'package:flutter/services.dart';
@ -13,7 +12,6 @@ import 'dart:convert';
import 'dart:io';
import 'dart:typed_data';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:glob/glob.dart';
import 'package:glob/list_local_fs.dart';
@ -43,7 +41,7 @@ class DiskAssetBundle extends CachingAssetBundle {
for (final pattern in globs) {
await for (final path in Glob(pattern).list(root: from)) {
if (path is File) {
final bytes = await (path as File).readAsBytes() as Uint8List;
final bytes = await (path as File).readAsBytes()/* as Uint8List*/;
cache[path.path] = ByteData.view(bytes.buffer);
}
}

39
lib/model.dart
View File

@ -251,7 +251,7 @@ class ContactInfoState extends ChangeNotifier {
savePeerHistory = "DeleteHistoryConfirmed",
numMessages = 0,
numUnread = 0,
lastMessageTime = null,
lastMessageTime,
server = "",
}) {
this._nickname = nickname;
@ -355,7 +355,9 @@ class MessageState extends ChangeNotifier {
String _message;
DateTime _timestamp;
String _senderOnion;
String _senderImage;
bool _ackd = false;
bool _loaded = false;
MessageState({
BuildContext context,
@ -363,26 +365,43 @@ class MessageState extends ChangeNotifier {
this.contactHandle,
this.messageIndex,
}) {
Provider.of<FlwtchState>(context, listen: false).cwtch.GetMessage(profileOnion, contactHandle, messageIndex).then((jsonMessage) {
dynamic messageWrapper = jsonDecode(jsonMessage);
dynamic message = jsonDecode(messageWrapper['Message']);
this._message = message['d'];
this._timestamp = DateTime.tryParse(messageWrapper['Timestamp']);
this._senderOnion = messageWrapper['PeerID'];
//update ackd last as it's changenotified
this._ackd = messageWrapper['Acknowledged'];
});
tryLoad(context);
}
get message => this._message;
get timestamp => this._timestamp;
get ackd => this._ackd;
get senderOnion => this._senderOnion;
get senderImage => this._senderImage;
get loaded => this._loaded;
set ackd(bool newVal) {
this._ackd = newVal;
notifyListeners();
}
void tryLoad(BuildContext context) {
Provider.of<FlwtchState>(context, listen: false).cwtch.GetMessage(profileOnion, contactHandle, messageIndex).then((jsonMessage) {
dynamic messageWrapper = jsonDecode(jsonMessage);
if (messageWrapper['Message'] == null || messageWrapper['Message'] == '' || messageWrapper['Message'] == '{}') {
this._senderOnion = profileOnion;
//todo: remove once sent group messages are prestored
Future.delayed(const Duration(milliseconds: 200), () {
tryLoad(context);
});
return;
}
dynamic message = jsonDecode(messageWrapper['Message']);
this._message = message['d'];
this._timestamp = DateTime.tryParse(messageWrapper['Timestamp']);
this._senderOnion = messageWrapper['PeerID'];
this._senderImage = messageWrapper['ContactImage'];
this._loaded = true;
//update ackd last as it's changenotified
this._ackd = messageWrapper['Acknowledged'];
});
}
}
/////////////

1
lib/views/contactsview.dart
View File

@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_app/widgets/contactrow.dart';
import 'package:provider/provider.dart';
import '../main.dart';
import 'addcontactview.dart';
import '../model.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';

13
lib/views/groupsettingsview.dart
View File

@ -1,4 +1,3 @@
import 'dart:convert';
import 'package:flutter/services.dart';
import 'package:flutter_app/model.dart';
import 'package:flutter_app/widgets/buttontextfield.dart';
@ -72,6 +71,18 @@ class _GroupSettingsViewState extends State<GroupSettingsView> {
controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).onion),
)
]),
Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
SizedBox(
height: 20,
),
CwtchLabel(label: AppLocalizations.of(context).server),
SizedBox(
height: 20,
),
CwtchTextField(
controller: TextEditingController(text: Provider.of<ContactInfoState>(context, listen: false).server),
)
]),
// Nickname Save Button
Column(mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [
SizedBox(

5
lib/views/messageview.dart
View File

@ -6,7 +6,6 @@ import 'package:provider/provider.dart';
import '../main.dart';
import '../model.dart';
import '../opaque.dart';
import '../settings.dart';
import '../widgets/messagelist.dart';
import 'groupsettingsview.dart';
@ -84,9 +83,9 @@ class _MessageViewState extends State<MessageView> {
.SendMessage(Provider.of<ContactInfoState>(context, listen: false).profileOnion, Provider.of<ContactInfoState>(context, listen: false).onion, jsonEncode(cm));
ctrlrCompose.clear();
focusNode.requestFocus();
if (Provider.of<ContactInfoState>(context, listen: false).isGroup == false) {
Future.delayed(const Duration(milliseconds: 80), () {
Provider.of<ContactInfoState>(context, listen: false).totalMessages++;
}
});
}
Widget _buildComposeBox() {

1
lib/views/profilemgrview.dart
View File

@ -2,7 +2,6 @@ import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_app/settings.dart';
import 'package:flutter_app/torstatus.dart';
import 'package:flutter_app/views/torstatusview.dart';
import 'package:flutter_app/widgets/passwordfield.dart';
import 'package:flutter_app/widgets/tor_icon.dart';

3
lib/views/torstatusview.dart
View File

@ -1,7 +1,4 @@
import 'dart:async';
import 'package:flutter/material.dart';
import 'package:flutter_app/settings.dart';
import 'package:flutter_app/torstatus.dart';
import 'package:flutter_app/widgets/tor_icon.dart';
import 'package:provider/provider.dart';

65
lib/widgets/messagebubble.dart
View File

@ -24,6 +24,40 @@ class MessageBubbleState extends State<MessageBubble> {
// user-configurable timestamps prolly ideal? #todo
prettyDate = DateFormat.yMd().add_jm().format(Provider.of<MessageState>(context).timestamp);
}
var wdgSender = Text(Provider.of<MessageState>(context).senderOnion ?? "",
style: TextStyle(fontSize: 9.0, color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor()));
var wdgMessage = SelectableText(
(Provider.of<MessageState>(context).message ?? "") + '\u202F',
key: Key(myKey),
focusNode: _focus,
style: TextStyle(
color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
),
textAlign: TextAlign.left,
textWidthBasis: TextWidthBasis.longestLine,
);
var wdgDecorations = Center(
widthFactor: 1.0,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(prettyDate,
style: TextStyle(
fontSize: 9.0,
color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
),
textAlign: fromMe ? TextAlign.right : TextAlign.left),
!fromMe
? SizedBox(width:1,height:1)
: Provider.of<MessageState>(context).ackd
? Icon(Icons.check_circle_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
: Icon(Icons.hourglass_bottom_outlined, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
],
));
return LayoutBuilder(builder: (context, constraints) {
//print(constraints.toString()+", "+constraints.maxWidth.toString());
return Container(
@ -45,36 +79,7 @@ class MessageBubbleState extends State<MessageBubble> {
crossAxisAlignment: fromMe ? CrossAxisAlignment.end : CrossAxisAlignment.start,
mainAxisAlignment: fromMe ? MainAxisAlignment.end : MainAxisAlignment.start,
mainAxisSize: MainAxisSize.min,
children: [
//Flexible(
//fit: BoxFit.contain,
SelectableText(
(Provider.of<MessageState>(context).message ?? "") + '\u202F',
key: Key(myKey),
focusNode: _focus,
style: TextStyle(
color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
),
textAlign: TextAlign.left,
textWidthBasis: TextWidthBasis.longestLine,
),
Center(
widthFactor: 1.0,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Text(prettyDate,
style: TextStyle(
fontSize: 9.0,
color: fromMe ? Provider.of<Settings>(context).theme.messageFromMeTextColor() : Provider.of<Settings>(context).theme.messageFromOtherTextColor(),
),
textAlign: fromMe ? TextAlign.right : TextAlign.left),
Provider.of<MessageState>(context).ackd
? Icon(Icons.check_circle_outline, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
: Icon(Icons.hourglass_bottom_outlined, color: Provider.of<Settings>(context).theme.messageFromMeTextColor(), size: 12)
],
))
]))));
children: fromMe ? [wdgMessage, wdgDecorations] : [wdgSender, wdgMessage, wdgDecorations]))));
});
}
}

4
lib/widgets/messagerow.dart
View File

@ -1,9 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_app/views/messageview.dart';
import 'package:flutter_app/widgets/profileimage.dart';
import 'package:provider/provider.dart';
import '../main.dart';
import '../model.dart';
import '../settings.dart';
import 'messagebubble.dart';
@ -35,7 +33,7 @@ class _MessageRowState extends State<MessageRow> {
var contact = Provider.of<ContactInfoState>(context);
Widget wdgPortrait = ProfileImage(
diameter: 48.0,
imagePath: contact.imagePath,
imagePath: Provider.of<MessageState>(context).senderImage ?? contact.imagePath,
//maskOut: contact.status != "Authenticated",
border: contact.status == "Authenticated" ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor());

1
test/profileimage_test.dart
View File

@ -8,7 +8,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_app/opaque.dart';
import 'package:flutter_app/settings.dart';
import 'package:flutter_app/widgets/cwtchlabel.dart';
import 'package:flutter_app/widgets/profileimage.dart';
import 'package:flutter_test/flutter_test.dart';
import 'package:provider/provider.dart';