Compare commits

...

3 Commits

Author SHA1 Message Date
erinn e6246cf44a Merge pull request 'Update Goldens' (#358) from custom_profile_images into trunk 8 months ago
Sarah Jamie Lewis d71574a831 Merge branch 'trunk' into custom_profile_images 8 months ago
Sarah Jamie Lewis 62bca86c19 Update Goldens 8 months ago
  1. 14
      lib/cwtch/cwtchNotifier.dart
  2. 3
      lib/views/addeditprofileview.dart
  3. BIN
      test/profileimage_init.png

@ -259,12 +259,14 @@ class CwtchNotifier {
case "UpdatedProfileAttribute":
if (data["Key"] == "public.profile.name") {
profileCN.getProfile(data["ProfileOnion"])?.nickname = data["Data"];
} else if (data["Key"].toString().startsWith("local.filesharing.") && data["Key"].toString().endsWith(".path")) {
// local.conversation.filekey.path
List<String> keyparts = data["Key"].toString().split(".");
if (keyparts.length == 5) {
String filekey = keyparts[2] + "." + keyparts[3];
profileCN.getProfile(data["ProfileOnion"])?.downloadSetPathForSender(filekey, data["Data"]);
} else if (data["Key"].toString().startsWith("local.filesharing.")) {
if (data["Key"].toString().endsWith(".path")) {
// local.conversation.filekey.path
List<String> keyparts = data["Key"].toString().split(".");
if (keyparts.length == 5) {
String filekey = keyparts[2] + "." + keyparts[3];
profileCN.getProfile(data["ProfileOnion"])?.downloadSetPathForSender(filekey, data["Data"]);
}
}
} else {
EnvironmentConfig.debugLog("unhandled set attribute event: ${data['Key']}");

@ -94,7 +94,8 @@ class _AddEditProfileViewState extends State<AddEditProfileView> {
cursor: Provider.of<Settings>(context).isExperimentEnabled(ImagePreviewsExperiment) ? SystemMouseCursors.click : SystemMouseCursors.basic,
child: GestureDetector(
// don't allow setting of profile images if the image previews experiment is disabled.
onTap: Provider.of<AppState>(context, listen: false).disableFilePicker || !Provider.of<Settings>(context, listen: false).isExperimentEnabled(ImagePreviewsExperiment)
onTap: Provider.of<AppState>(context, listen: false).disableFilePicker ||
!Provider.of<Settings>(context, listen: false).isExperimentEnabled(ImagePreviewsExperiment)
? null
: () {
filesharing.showFilePicker(context, MaxImageFileSharingSize, (File file) {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

Loading…
Cancel
Save