Fix Change Password for Unencrypted Profiles / Handle TokenUpdates with No Tokens / Format
continuous-integration/drone/pr Build is running
Details
continuous-integration/drone/pr Build is running
Details
This commit is contained in:
parent
7ee619f1a6
commit
27a729d09a
|
@ -72,7 +72,8 @@ class CwtchNotifier {
|
||||||
}
|
}
|
||||||
EnvironmentConfig.debugLog("NewPeer $data");
|
EnvironmentConfig.debugLog("NewPeer $data");
|
||||||
// if tag != v1-defaultPassword then it is either encrypted OR it is an unencrypted account created during pre-beta...
|
// 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["autostart"] == "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;
|
break;
|
||||||
case "ContactCreated":
|
case "ContactCreated":
|
||||||
EnvironmentConfig.debugLog("ContactCreated $data");
|
EnvironmentConfig.debugLog("ContactCreated $data");
|
||||||
|
@ -310,12 +311,16 @@ class CwtchNotifier {
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.replaceServers(data["ServerList"]);
|
profileCN.getProfile(data["ProfileOnion"])?.replaceServers(data["ServerList"]);
|
||||||
break;
|
break;
|
||||||
case "TokenManagerInfo":
|
case "TokenManagerInfo":
|
||||||
|
try {
|
||||||
List<dynamic> associatedGroups = jsonDecode(data["Data"]);
|
List<dynamic> associatedGroups = jsonDecode(data["Data"]);
|
||||||
int count = int.parse(data["ServerTokenCount"]);
|
int count = int.parse(data["ServerTokenCount"]);
|
||||||
associatedGroups.forEach((identifier) {
|
associatedGroups.forEach((identifier) {
|
||||||
profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(int.parse(identifier.toString()))!.antispamTickets = count;
|
profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(int.parse(identifier.toString()))!.antispamTickets = count;
|
||||||
});
|
});
|
||||||
EnvironmentConfig.debugLog("update server token count for ${associatedGroups}, $count");
|
EnvironmentConfig.debugLog("update server token count for ${associatedGroups}, $count");
|
||||||
|
} catch (e) {
|
||||||
|
// No tokens in data...
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case "NewGroup":
|
case "NewGroup":
|
||||||
String invite = data["GroupInvite"].toString();
|
String invite = data["GroupInvite"].toString();
|
||||||
|
|
|
@ -124,6 +124,10 @@ class ProfileInfoState extends ChangeNotifier {
|
||||||
|
|
||||||
// Check encrypted status for profile info screen
|
// Check encrypted status for profile info screen
|
||||||
bool get isEncrypted => this._encrypted;
|
bool get isEncrypted => this._encrypted;
|
||||||
|
set isEncrypted(bool newValue) {
|
||||||
|
this._encrypted = newValue;
|
||||||
|
notifyListeners();
|
||||||
|
}
|
||||||
|
|
||||||
String get nickname => this._nickname;
|
String get nickname => this._nickname;
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,15 @@ class ProfileListState extends ChangeNotifier {
|
||||||
var idx = _profiles.indexWhere((element) => element.onion == onion);
|
var idx = _profiles.indexWhere((element) => element.onion == onion);
|
||||||
if (idx == -1) {
|
if (idx == -1) {
|
||||||
_profiles.add(ProfileInfoState(
|
_profiles.add(ProfileInfoState(
|
||||||
onion: onion, nickname: name, imagePath: picture, defaultImagePath: defaultPicture, contactsJson: contactsJson, serversJson: serverJson, online: online, autostart: autostart, encrypted: encrypted));
|
onion: onion,
|
||||||
|
nickname: name,
|
||||||
|
imagePath: picture,
|
||||||
|
defaultImagePath: defaultPicture,
|
||||||
|
contactsJson: contactsJson,
|
||||||
|
serversJson: serverJson,
|
||||||
|
online: online,
|
||||||
|
autostart: autostart,
|
||||||
|
encrypted: encrypted));
|
||||||
} else {
|
} else {
|
||||||
_profiles[idx].updateFrom(onion, name, picture, contactsJson, serverJson, online);
|
_profiles[idx].updateFrom(onion, name, picture, contactsJson, serverJson, online);
|
||||||
}
|
}
|
||||||
|
|
|
@ -199,7 +199,9 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
||||||
Provider.of<ProfileInfoState>(context).autostart = value;
|
Provider.of<ProfileInfoState>(context).autostart = value;
|
||||||
|
|
||||||
if (!Provider.of<ProfileInfoState>(context).onion.isEmpty) {
|
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");
|
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,
|
activeTrackColor: Provider.of<Settings>(context).theme.defaultButtonColor,
|
||||||
|
@ -207,7 +209,6 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
||||||
secondary: Icon(CwtchIcons.favorite_24dp, color: Provider.of<Settings>(context).current().mainTextColor),
|
secondary: Icon(CwtchIcons.favorite_24dp, color: Provider.of<Settings>(context).current().mainTextColor),
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
||||||
Visibility(
|
Visibility(
|
||||||
visible: Provider.of<ProfileInfoState>(context).onion.isEmpty,
|
visible: Provider.of<ProfileInfoState>(context).onion.isEmpty,
|
||||||
child: SizedBox(
|
child: SizedBox(
|
||||||
|
@ -418,7 +419,9 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
||||||
var profile = Provider.of<ProfileInfoState>(context, listen: false).onion;
|
var profile = Provider.of<ProfileInfoState>(context, listen: false).onion;
|
||||||
Provider.of<ProfileInfoState>(context, listen: false).nickname = ctrlrNick.value.text;
|
Provider.of<ProfileInfoState>(context, listen: false).nickname = ctrlrNick.value.text;
|
||||||
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(profile, "profile.name", ctrlrNick.value.text);
|
Provider.of<FlwtchState>(context, listen: false).cwtch.SetProfileAttribute(profile, "profile.name", ctrlrNick.value.text);
|
||||||
Provider.of<FlwtchState>(context, listen: false).cwtch.ChangePassword(profile, ctrlrOldPass.text, ctrlrPass.text, ctrlrPass2.text);
|
// Use default password if the profile is unencrypted
|
||||||
|
var password = Provider.of<ProfileInfoState>(context, listen: false).isEncrypted ? ctrlrOldPass.text : DefaultPassword;
|
||||||
|
Provider.of<FlwtchState>(context, listen: false).cwtch.ChangePassword(profile, password, ctrlrPass.text, ctrlrPass2.text);
|
||||||
|
|
||||||
EnvironmentConfig.debugLog("waiting for change password response");
|
EnvironmentConfig.debugLog("waiting for change password response");
|
||||||
Future.delayed(const Duration(milliseconds: 500), () {
|
Future.delayed(const Duration(milliseconds: 500), () {
|
||||||
|
@ -434,6 +437,8 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
|
||||||
}
|
}
|
||||||
}).whenComplete(() {
|
}).whenComplete(() {
|
||||||
if (globalErrorHandler.explicitChangePasswordSuccess) {
|
if (globalErrorHandler.explicitChangePasswordSuccess) {
|
||||||
|
// we need to set the local encrypted status to display correct password forms on this run...
|
||||||
|
Provider.of<ProfileInfoState>(context, listen: false).isEncrypted = true;
|
||||||
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.newPassword));
|
final snackBar = SnackBar(content: Text(AppLocalizations.of(context)!.newPassword));
|
||||||
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
ScaffoldMessenger.of(context).showSnackBar(snackBar);
|
||||||
Navigator.pop(context);
|
Navigator.pop(context);
|
||||||
|
|
|
@ -95,7 +95,9 @@ class _ContactsViewState extends State<ContactsView> {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return ScaffoldMessenger(key: scaffoldKey, child: Scaffold(
|
return ScaffoldMessenger(
|
||||||
|
key: scaffoldKey,
|
||||||
|
child: Scaffold(
|
||||||
endDrawerEnableOpenDragGesture: false,
|
endDrawerEnableOpenDragGesture: false,
|
||||||
drawerEnableOpenDragGesture: false,
|
drawerEnableOpenDragGesture: false,
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
|
@ -124,7 +126,8 @@ class _ContactsViewState extends State<ContactsView> {
|
||||||
child: CircleAvatar(
|
child: CircleAvatar(
|
||||||
radius: 10.0,
|
radius: 10.0,
|
||||||
backgroundColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor,
|
backgroundColor: Provider.of<Settings>(context).theme.portraitProfileBadgeColor,
|
||||||
child: Text(unreadCount > 99 ? "99+" : unreadCount.toString(), style: TextStyle(color: Provider.of<Settings>(context).theme.portraitProfileBadgeTextColor, fontSize: 8.0)),
|
child:
|
||||||
|
Text(unreadCount > 99 ? "99+" : unreadCount.toString(), style: TextStyle(color: Provider.of<Settings>(context).theme.portraitProfileBadgeTextColor, fontSize: 8.0)),
|
||||||
));
|
));
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
|
|
|
@ -82,10 +82,12 @@ class _ProfileImageState extends State<ProfileImage> {
|
||||||
width: widget.diameter,
|
width: widget.diameter,
|
||||||
height: widget.diameter,
|
height: widget.diameter,
|
||||||
color: widget.border,
|
color: widget.border,
|
||||||
foregroundDecoration: widget.disabled ? BoxDecoration(
|
foregroundDecoration: widget.disabled
|
||||||
|
? BoxDecoration(
|
||||||
color: Provider.of<Settings>(context).theme.portraitBackgroundColor, //Colors.grey,
|
color: Provider.of<Settings>(context).theme.portraitBackgroundColor, //Colors.grey,
|
||||||
backgroundBlendMode: BlendMode.color, //saturation,
|
backgroundBlendMode: BlendMode.color, //saturation,
|
||||||
) : null,
|
)
|
||||||
|
: null,
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(2.0), //border size
|
padding: const EdgeInsets.all(2.0), //border size
|
||||||
child: ClipOval(clipBehavior: Clip.antiAlias, child: widget.tooltip == "" ? image : Tooltip(message: widget.tooltip, child: image))))),
|
child: ClipOval(clipBehavior: Clip.antiAlias, child: widget.tooltip == "" ? image : Tooltip(message: widget.tooltip, child: image))))),
|
||||||
|
@ -112,17 +114,12 @@ class _ProfileImageState extends State<ProfileImage> {
|
||||||
child: Container(
|
child: Container(
|
||||||
width: widget.diameter,
|
width: widget.diameter,
|
||||||
height: widget.diameter,
|
height: widget.diameter,
|
||||||
child:
|
child: Center(
|
||||||
Center(
|
|
||||||
|
|
||||||
|
|
||||||
child: Icon(
|
child: Icon(
|
||||||
CwtchIcons.negative_heart_24px,
|
CwtchIcons.negative_heart_24px,
|
||||||
size: widget.diameter / 1.5,
|
size: widget.diameter / 1.5,
|
||||||
color: Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
|
color: Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
|
||||||
)
|
)))),
|
||||||
|
|
||||||
))),
|
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue