cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

Formatting
continuous-integration/drone/pr Build is running Details

This commit is contained in:
Sarah Jamie Lewis 2023-09-06 10:54:51 -07:00
parent a0a00b1ade
commit 60b2b34abc
7 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cwtch/ffi.dart
View File

@ -924,9 +924,6 @@ class CwtchFfi implements Cwtch {
malloc.free(u1);
}
@override
bool IsServersCompiled() {
return library.providesSymbol("c_LoadServers");

1
lib/cwtch/gomobile.dart
View File

@ -365,7 +365,6 @@ class CwtchGomobile implements Cwtch {
cwtchPlatform.invokeMethod("DeleteServerInfo", {"ProfileOnion": profile, "handle": handle});
}
@override
void UpdateSettings(String json) {
cwtchPlatform.invokeMethod("UpdateSettings", {"json": json});

1
lib/models/profile.dart
View File

@ -68,7 +68,6 @@ class ProfileInfoState extends ChangeNotifier {
this._contacts.addAll(contacts.map((contact) {
this._unreadMessages += contact["numUnread"] as int;
return ContactInfoState(this.onion, contact["identifier"], contact["onion"],
nickname: contact["name"],
localNickname: contact["attributes"]?["local.profile.name"] ?? "", // contact may not have a local name

2
lib/settings.dart
View File

@ -134,7 +134,7 @@ class Settings extends ChangeNotifier {
// Decide whether to enable Experiments
var fontScale = settings["FontScaling"];
if (fontScale == null) {
fontScale = 1.0;
fontScale = 1.0;
}
_fontScaling = double.parse(fontScale.toString()).clamp(0.5, 2.0);

20
lib/views/peersettingsview.dart
View File

@ -217,12 +217,12 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
subtitle: Text(AppLocalizations.of(context)!.savePeerHistoryDescription),
leading: Icon(CwtchIcons.peer_history, color: settings.current().mainTextColor),
trailing: DropdownButton(
value: (Provider.of<ContactInfoState>(context).savePeerHistory == "DefaultDeleteHistory" ||
Provider.of<ContactInfoState>(context).savePeerHistory == "HistoryDefault")
? AppLocalizations.of(context)!.conversationNotificationPolicyDefault
: (Provider.of<ContactInfoState>(context).savePeerHistory == "SaveHistory"
? AppLocalizations.of(context)!.savePeerHistory
: AppLocalizations.of(context)!.dontSavePeerHistory),
value:
(Provider.of<ContactInfoState>(context).savePeerHistory == "DefaultDeleteHistory" || Provider.of<ContactInfoState>(context).savePeerHistory == "HistoryDefault")
? AppLocalizations.of(context)!.conversationNotificationPolicyDefault
: (Provider.of<ContactInfoState>(context).savePeerHistory == "SaveHistory"
? AppLocalizations.of(context)!.savePeerHistory
: AppLocalizations.of(context)!.dontSavePeerHistory),
onChanged: (newValue) {
setState(() {
// Set whether or not to dave the Contact History...
@ -234,7 +234,7 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
const HistoryDefault = "HistoryDefault";
// NOTE: .savePeerHistory is used to show ephemeral warnings so it's state is important to update.
if(newValue == AppLocalizations.of(context)!.conversationNotificationPolicyDefault) {
if (newValue == AppLocalizations.of(context)!.conversationNotificationPolicyDefault) {
Provider.of<ContactInfoState>(context, listen: false).savePeerHistory = HistoryDefault;
Provider.of<FlwtchState>(context, listen: false).cwtch.SetConversationAttribute(profileOnion, identifier, SaveHistoryKey, HistoryDefault);
} else if (newValue == AppLocalizations.of(context)!.savePeerHistory) {
@ -246,7 +246,11 @@ class _PeerSettingsViewState extends State<PeerSettingsView> {
}
});
},
items: [AppLocalizations.of(context)!.conversationNotificationPolicyDefault, AppLocalizations.of(context)!.savePeerHistory, AppLocalizations.of(context)!.dontSavePeerHistory].map<DropdownMenuItem<String>>((String value) {
items: [
AppLocalizations.of(context)!.conversationNotificationPolicyDefault,
AppLocalizations.of(context)!.savePeerHistory,
AppLocalizations.of(context)!.dontSavePeerHistory
].map<DropdownMenuItem<String>>((String value) {
return DropdownMenuItem<String>(
value: value,
child: Text(value, style: settings.scaleFonts(defaultDropDownMenuItemTextStyle)),

9
lib/views/remoteserverview.dart
View File

@ -97,9 +97,11 @@ class _RemoteServerViewState extends State<RemoteServerView> {
Tooltip(
message: serverInfoState.groups.isNotEmpty ? AppLocalizations.of(context)!.cannotDeleteServerIfActiveGroups : AppLocalizations.of(context)!.leaveConversation,
child: ElevatedButton.icon(
onPressed: serverInfoState.groups.isNotEmpty ? null : () {
showAlertDialog(context);
},
onPressed: serverInfoState.groups.isNotEmpty
? null
: () {
showAlertDialog(context);
},
icon: Icon(CwtchIcons.leave_group),
label: Text(
AppLocalizations.of(context)!.deleteBtn,
@ -112,7 +114,6 @@ class _RemoteServerViewState extends State<RemoteServerView> {
child: Text(AppLocalizations.of(context)!.groupsOnThisServerLabel),
),
Expanded(child: _buildGroupsList(serverInfoState)),
])));
});
}

2
lib/widgets/messagelist.dart
View File

@ -38,7 +38,7 @@ class _MessageListState extends State<MessageList> {
//bool isGroupAndSynced = Provider.of<ContactInfoState>(context).isGroup && Provider.of<ContactInfoState>(context).status == "Synced";
//bool isGroupAndNotAuthenticated = Provider.of<ContactInfoState>(context).isGroup && Provider.of<ContactInfoState>(context).status != "Authenticated";
bool preserveHistoryByDefault = Provider.of<Settings>(context, listen:false).preserveHistoryByDefault;
bool preserveHistoryByDefault = Provider.of<Settings>(context, listen: false).preserveHistoryByDefault;
bool showEphemeralWarning = (isP2P && (!preserveHistoryByDefault && Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory"));
bool showOfflineWarning = Provider.of<ContactInfoState>(context).isOnline() == false;
bool showSyncing = isGroupAndSyncing;