cwtch.im
/
cwtch-ui
6
10
Fork 16
Code Issues 96 Pull Requests 3 Projects 3 Releases 21 Wiki Activity

support (de)activatePeerEngine; turning peers on/off; autostart peers; new UI update for offline contacts/profiles

Browse Source
fixes
Dan Ballard 6 months ago
parent f29e926d28
commit d4546199e4
13 changed files with 139 additions and 7 deletions
Show Stats Download Patch File Download Diff File

2
LIBCWTCH-GO-MACOS.version
Unescape View File

@ -1 +1 @@
2022-11-30-14-27-v1.10.0
2022-12-05-13-24-v1.10.0-6-g0d05a07

2
LIBCWTCH-GO.version
Unescape View File

@ -1 +1 @@
2022-11-30-19-28-v1.10.0
2022-12-05-18-24-v1.10.0-6-g0d05a07

8
android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
Unescape View File

@ -364,6 +364,14 @@ class MainActivity: FlutterActivity() {
val pass: String = call.argument("pass") ?: ""
Cwtch.loadProfiles(pass)
}
"ActivatePeerEngine" -> {
val profile: String = call.argument("profile") ?: ""
Cwtch.activatePeerEngine(profile)
}
"DeactivatePeerEngine" -> {
val profile: String = call.argument("profile") ?: ""
Cwtch.deactivatePeerEngine(profile)
}
"ChangePassword" -> {
val profile: String = call.argument("ProfileOnion") ?: ""
val pass: String = call.argument("OldPass") ?: ""

6
lib/cwtch/cwtch.dart
Unescape View File

@ -12,6 +12,12 @@ abstract class Cwtch {
// ignore: non_constant_identifier_names
void CreateProfile(String nick, String pass);
// ignore: non_constant_identifier_names
void ActivatePeerEngine(String profile);
// ignore: non_constant_identifier_names
void DeactivatePeerEngine(String profile);
// ignore: non_constant_identifier_names
void LoadProfiles(String pass);
// ignore: non_constant_identifier_names

2
lib/cwtch/cwtchNotifier.dart
Unescape View File

@ -72,7 +72,7 @@ class CwtchNotifier {
}
EnvironmentConfig.debugLog("NewPeer $data");
// if tag != v1-defaultPassword then it is either encrypted OR it is an unencrypted account created during pre-beta...
profileCN.add(data["Identity"], data["name"], data["picture"], data["defaultPicture"], data["ContactsJson"], data["ServerList"], data["Online"] == "true", data["tag"] != "v1-defaultPassword");
profileCN.add(data["Identity"], data["name"], data["picture"], data["defaultPicture"], data["ContactsJson"], data["ServerList"], data["Online"] == "true", data["autostart"] == "true", data["tag"] != "v1-defaultPassword");
break;
case "ContactCreated":
EnvironmentConfig.debugLog("ContactCreated $data");

18
lib/cwtch/ffi.dart
Unescape View File

@ -301,6 +301,24 @@ class CwtchFfi implements Cwtch {
malloc.free(ut8pass);
}
// ignore: non_constant_identifier_names
void ActivatePeerEngine(String profile) {
var activatePeerEngineC = library.lookup<NativeFunction<string_to_void_function>>("c_ActivatePeerEngine");
final ActivatePeerEngine = activatePeerEngineC.asFunction<StringFn>();
final ut8profile = profile.toNativeUtf8();
ActivatePeerEngine(ut8profile, ut8profile.length);
malloc.free(ut8profile);
}
// ignore: non_constant_identifier_names
void DeactivatePeerEngine(String profile) {
var deactivatePeerEngineC = library.lookup<NativeFunction<string_to_void_function>>("c_ActivatePeerEngine");
final DeactivatePeerEngine = deactivatePeerEngineC.asFunction<StringFn>();
final ut8profile = profile.toNativeUtf8();
DeactivatePeerEngine(ut8profile, ut8profile.length);
malloc.free(ut8profile);
}
// ignore: non_constant_identifier_names
void LoadProfiles(String pass) {
var loadProfileC = library.lookup<NativeFunction<string_to_void_function>>("c_LoadProfiles");

10
lib/cwtch/gomobile.dart
Unescape View File

@ -75,6 +75,16 @@ class CwtchGomobile implements Cwtch {
cwtchPlatform.invokeMethod("CreateProfile", {"nick": nick, "pass": pass});
}
// ignore: non_constant_identifier_names
void ActivatePeerEngine(String profile) {
cwtchPlatform.invokeMethod("ActivatePeerEngine", {"profile": profile});
}
// ignore: non_constant_identifier_names
void DeactivatePeerEngine(String profile) {
cwtchPlatform.invokeMethod("DeactivatePeerEngine", {"profile": profile});
}
// ignore: non_constant_identifier_names
void LoadProfiles(String pass) {
cwtchPlatform.invokeMethod("LoadProfiles", {"pass": pass});

23
lib/models/profile.dart
Unescape View File

@ -26,6 +26,9 @@ class ProfileInfoState extends ChangeNotifier {
// in the constructor if the profile is encrypted with the defacto password.
bool _encrypted = true;
bool _autostart = true;
bool _enabled = false;
ProfileInfoState({
required this.onion,
nickname = "",
@ -35,6 +38,7 @@ class ProfileInfoState extends ChangeNotifier {
contactsJson = "",
serversJson = "",
online = false,
autostart = true,
encrypted = true,
String,
}) {
@ -43,6 +47,11 @@ class ProfileInfoState extends ChangeNotifier {
this._defaultImagePath = defaultImagePath;
this._unreadMessages = unreadMessages;
this._online = online;
this._enabled = _enabled;
this._autostart = autostart;
if (autostart) {
this._enabled = true;
}
this._encrypted = encrypted;
_contacts.connectServers(this._servers);
@ -130,6 +139,20 @@ class ProfileInfoState extends ChangeNotifier {
notifyListeners();
}
bool get enabled => this._enabled;
set enabled(bool newVal) {
this._enabled = newVal;
notifyListeners();
}
bool get autostart => this._autostart;
set autostart(bool newVal) {
this._autostart = newVal;
notifyListeners();
}
String get defaultImagePath => this._defaultImagePath;
set defaultImagePath(String newVal) {

6
lib/models/profilelist.dart
Unescape View File

@ -1,3 +1,5 @@
import 'dart:ui';
import 'package:flutter/cupertino.dart';
import 'package:flutter/widgets.dart';
@ -7,11 +9,11 @@ class ProfileListState extends ChangeNotifier {
List<ProfileInfoState> _profiles = [];
int get num => _profiles.length;
void add(String onion, String name, String picture, String defaultPicture, String contactsJson, String serverJson, bool online, bool encrypted) {
void add(String onion, String name, String picture, String defaultPicture, String contactsJson, String serverJson, bool online, bool autostart, bool encrypted) {
var idx = _profiles.indexWhere((element) => element.onion == onion);
if (idx == -1) {
_profiles.add(ProfileInfoState(
onion: onion, nickname: name, imagePath: picture, defaultImagePath: defaultPicture, contactsJson: contactsJson, serversJson: serverJson, online: online, encrypted: encrypted));
onion: onion, nickname: name, imagePath: picture, defaultImagePath: defaultPicture, contactsJson: contactsJson, serversJson: serverJson, online: online, autostart: autostart, encrypted: encrypted));
} else {
_profiles[idx].updateFrom(onion, name, picture, contactsJson, serverJson, online);
}

39
lib/views/addeditprofileview.dart
Unescape View File

@ -169,6 +169,45 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
)
])),
// We only allow setting password types on profile creation
// Enabled
Visibility(
visible: Provider.of<ProfileInfoState>(context).onion.isNotEmpty,
child: SwitchListTile(
title: Text(AppLocalizations.of(context)!.serverEnabled, style: TextStyle(color: Provider.of<Settings>(context).current().mainTextColor)),
subtitle: Text(AppLocalizations.of(context)!.serverEnabledDescription),
value: Provider.of<ProfileInfoState>(context).enabled,
onChanged: (bool value) {
Provider.of<ProfileInfoState>(context).enabled = value;
if (value) {
Provider.of<FlwtchState>(context, listen: false).cwtch.ActivatePeerEngine(Provider.of<ProfileInfoState>(context).onion);
} else {
Provider.of<FlwtchState>(context, listen: false).cwtch.DeactivatePeerEngine(Provider.of<ProfileInfoState>(context).onion);
}
},
activeTrackColor: Provider.of<Settings>(context).theme.defaultButtonColor,
inactiveTrackColor: Provider.of<Settings>(context).theme.defaultButtonDisabledColor,
secondary: Icon(CwtchIcons.negative_heart_24px, color: Provider.of<Settings>(context).current().mainTextColor),
)),
// Auto start
SwitchListTile(
title: Text(AppLocalizations.of(context)!.serverAutostartLabel, style: TextStyle(color: Provider.of<Settings>(context).current().mainTextColor)),
subtitle: Text(AppLocalizations.of(context)!.serverAutostartDescription),
value: Provider.of<ProfileInfoState>(context).autostart,
onChanged: (bool value) {
Provider.of<ProfileInfoState>(context).autostart = value;
if (!Provider.of<ProfileInfoState>(context).onion.isEmpty) {
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(Provider.of<ProfileInfoState>(context).onion, "profile.autostart", value ? "true" : "false");
}
},
activeTrackColor: Provider.of<Settings>(context).theme.defaultButtonColor,
inactiveTrackColor: Provider.of<Settings>(context).theme.defaultButtonDisabledColor,
secondary: Icon(CwtchIcons.favorite_24dp, color: Provider.of<Settings>(context).current().mainTextColor),
),
Visibility(
visible: Provider.of<ProfileInfoState>(context).onion.isEmpty,
child: SizedBox(

2
lib/widgets/contactrow.dart
Unescape View File

@ -51,7 +51,7 @@ class _ContactRowState extends State<ContactRow> {
badgeTextColor: Provider.of<Settings>(context).theme.portraitContactBadgeTextColor,
diameter: 64.0,
imagePath: Provider.of<Settings>(context).isExperimentEnabled(ImagePreviewsExperiment) ? contact.imagePath : contact.defaultImagePath,
maskOut: !contact.isOnline(),
disabled: !contact.isOnline(),
border: contact.isOnline()
? Provider.of<Settings>(context).theme.portraitOnlineBorderColor
: contact.isBlocked

27
lib/widgets/profileimage.dart
Unescape View File

@ -1,6 +1,7 @@
import 'dart:io';
import 'dart:math';
import 'package:cwtch/cwtch_icons_icons.dart';
import 'package:flutter/material.dart';
import 'package:cwtch/themes/opaque.dart';
import 'package:provider/provider.dart';
@ -17,6 +18,7 @@ class ProfileImage extends StatefulWidget {
required this.badgeTextColor,
this.maskOut = false,
this.tooltip = "",
this.disabled = false,
this.badgeEdit = false,
this.badgeIcon = null});
final double diameter;
@ -26,6 +28,7 @@ class ProfileImage extends StatefulWidget {
final Color badgeColor;
final Color badgeTextColor;
final bool maskOut;
final bool disabled;
final bool badgeEdit;
final String tooltip;
final Widget? badgeIcon;
@ -79,10 +82,15 @@ class _ProfileImageState extends State<ProfileImage> {
width: widget.diameter,
height: widget.diameter,
color: widget.border,
foregroundDecoration: widget.disabled ? BoxDecoration(
color: Provider.of<Settings>(context).theme.portraitBackgroundColor, //Colors.grey,
backgroundBlendMode: BlendMode.color, //saturation,
) : null,
child: Padding(
padding: const EdgeInsets.all(2.0), //border size
child: ClipOval(clipBehavior: Clip.antiAlias, child: widget.tooltip == "" ? image : Tooltip(message: widget.tooltip, child: image))))),
Visibility(
// badge
Visibility(
visible: widget.badgeIcon != null || widget.badgeEdit || widget.badgeCount > 0,
child: Positioned(
bottom: 0.0,
@ -98,6 +106,23 @@ class _ProfileImageState extends State<ProfileImage> {
: (widget.badgeIcon != null ? widget.badgeIcon : Text(widget.badgeCount > 99 ? "99+" : widget.badgeCount.toString(), style: TextStyle(color: widget.badgeTextColor, fontSize: 8.0))),
),
)),
// disabled center icon
Visibility(
visible: widget.disabled,
child: Container(
width: widget.diameter,
height: widget.diameter,
child:
Center(
child: ImageIcon(
AssetImage("assets/core/negative_heart_512px.png"),
size: widget.diameter / 1.25,
color: Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
)
))),
]));
}
}

1
lib/widgets/profilerow.dart
Unescape View File

@ -37,6 +37,7 @@ class _ProfileRowState extends State<ProfileRow> {
badgeCount: profile.unreadMessages,
badgeColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor,
badgeTextColor: Provider.of<Settings>(context).theme.portraitProfileBadgeTextColor,
disabled: !profile.enabled,
diameter: 64.0,
imagePath: Provider.of<Settings>(context).isExperimentEnabled(ImagePreviewsExperiment) ? profile.imagePath : profile.defaultImagePath,
border: profile.isOnline ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor)),

Write Preview
Loading…
Cancel
Save