HOTFIX bump version and disallow delete / block for me contact

coi-dev · May 27, 2020 · 38fc95e · 38fc95e
1 parent 6d5a386
commit 38fc95e
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 30 deletions.
diff --git a/lib/src/contact/contact_details.dart b/lib/src/contact/contact_details.dart
@@ -40,6 +40,7 @@
  * for more details.
  */
 
+import 'package:delta_chat_core/delta_chat_core.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
@@ -142,20 +143,23 @@ class _ContactDetailsState extends State<ContactDetails> with ChatCreateMixin {
                     iconBackground: CustomTheme.of(context).chatIcon,
                     onTap: () => createChatFromContact(context, widget.contactId),
                   ),
-                  SettingsItem(
-                    pushesNewScreen: false,
-                    key: Key(keyUserProfileBlockIconSource),
-                    icon: IconSource.block,
-                    text: L10n.get(L.contactBlock),
-                    iconBackground: CustomTheme.of(context).serverSettingsIcon,
-                    onTap: () => showActionDialog(
-                      context,
-                      ProfileActionType.block,
-                      _blockContact,
-                      {
-                        ProfileActionParams.name: state.name,
-                        ProfileActionParams.email: state.email,
-                      },
+                  Visibility(
+                    visible: widget.contactId != Contact.idSelf,
+                    child: SettingsItem(
+                      pushesNewScreen: false,
+                      key: Key(keyUserProfileBlockIconSource),
+                      icon: IconSource.block,
+                      text: L10n.get(L.contactBlock),
+                      iconBackground: CustomTheme.of(context).serverSettingsIcon,
+                      onTap: () => showActionDialog(
+                        context,
+                        ProfileActionType.block,
+                        _blockContact,
+                        {
+                          ProfileActionParams.name: state.name,
+                          ProfileActionParams.email: state.email,
+                        },
+                      ),
                     ),
                   ),
                   ListGroupHeader(
@@ -171,21 +175,24 @@ class _ContactDetailsState extends State<ContactDetails> with ChatCreateMixin {
                   ListGroupHeader(
                     text: "",
                   ),
-                  SettingsItem(
-                    pushesNewScreen: false,
-                    key: Key(keyContactDetailDeleteContactProfileActionIcon),
-                    icon: IconSource.delete,
-                    text: L10n.get(L.contactDelete),
-                    textColor: CustomTheme.of(context).error,
-                    iconBackground: CustomTheme.of(context).blockIcon,
-                    onTap: () => showActionDialog(
-                      context,
-                      ProfileActionType.deleteContact,
-                      _deleteContact,
-                      {
-                        ProfileActionParams.name: state.name,
-                        ProfileActionParams.email: state.email,
-                      },
+                  Visibility(
+                    visible: widget.contactId != Contact.idSelf,
+                    child: SettingsItem(
+                      pushesNewScreen: false,
+                      key: Key(keyContactDetailDeleteContactProfileActionIcon),
+                      icon: IconSource.delete,
+                      text: L10n.get(L.contactDelete),
+                      textColor: CustomTheme.of(context).error,
+                      iconBackground: CustomTheme.of(context).blockIcon,
+                      onTap: () => showActionDialog(
+                        context,
+                        ProfileActionType.deleteContact,
+                        _deleteContact,
+                        {
+                          ProfileActionParams.name: state.name,
+                          ProfileActionParams.email: state.email,
+                        },
+                      ),
                     ),
                   ),
                 ],

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: ox_coi
 description: OX COI Messenger is a mail based chat app.
 
-version: 0.700.1+517 # x.y.z+build-number
+version: 0.700.2+518 # x.y.z+build-number
 
 environment:
   sdk: ">=2.6.0 <3.0.0"