removed 'contact-only' hint from publish avtar screen

6 files changed, 38 insertions, 60 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
index 2bb388531..d4b5c6fa4 100644
--- a/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/PublishProfilePictureActivity.java
@@ -56,35 +56,28 @@ public class PublishProfilePictureActivity extends XmppActivity {
 
         @Override
         public void success(Avatar object) {
-            runOnUiThread(new Runnable() {
-
-                @Override
-                public void run() {
-                    if (mInitialAccountSetup) {
-                        Intent intent = new Intent(getApplicationContext(),
-                                StartConversationActivity.class);
-                        intent.putExtra("init", true);
-                        startActivity(intent);
-                    }
-                    Toast.makeText(PublishProfilePictureActivity.this,
-                            R.string.avatar_has_been_published,
-                            Toast.LENGTH_SHORT).show();
-                    finish();
+            runOnUiThread(() -> {
+                if (mInitialAccountSetup) {
+                    Intent intent = new Intent(getApplicationContext(),
+                            StartConversationActivity.class);
+                    intent.putExtra("init", true);
+                    startActivity(intent);
                 }
+                Toast.makeText(PublishProfilePictureActivity.this,
+                        R.string.avatar_has_been_published,
+                        Toast.LENGTH_SHORT).show();
+                finish();
             });
         }
 
         @Override
         public void error(final int errorCode, Avatar object) {
-            runOnUiThread(new Runnable() {
-
-                @Override
-                public void run() {
-                    hintOrWarning.setText(errorCode);
-                    hintOrWarning.setTextColor(getWarningTextColor());
-                    publishButton.setText(R.string.publish);
-                    enablePublishButton();
-                }
+            runOnUiThread(() -> {
+                hintOrWarning.setText(errorCode);
+                hintOrWarning.setTextColor(getWarningTextColor());
+                hintOrWarning.setVisibility(View.VISIBLE);
+                publishButton.setText(R.string.publish);
+                enablePublishButton();
             });
 
         }
@@ -116,30 +109,22 @@ public class PublishProfilePictureActivity extends XmppActivity {
                 }
             }
         });
-        this.cancelButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                if (mInitialAccountSetup) {
-                    Intent intent = new Intent(getApplicationContext(),
-                            StartConversationActivity.class);
-                    if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1) {
-                        intent.putExtra("init", true);
-                    }
-                    startActivity(intent);
+        this.cancelButton.setOnClickListener(v -> {
+            if (mInitialAccountSetup) {
+                Intent intent = new Intent(getApplicationContext(),
+                        StartConversationActivity.class);
+                if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 1) {
+                    intent.putExtra("init", true);
                 }
-                finish();
+                startActivity(intent);
             }
+            finish();
         });
-        this.avatar.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-                if (hasStoragePermission(REQUEST_CHOOSE_FILE)) {
-                    chooseAvatar(false);
-                }
-
+        this.avatar.setOnClickListener(v -> {
+            if (hasStoragePermission(REQUEST_CHOOSE_FILE)) {
+                chooseAvatar(false);
             }
+
         });
         this.defaultUri = PhoneHelper.getProfilePictureUri(getApplicationContext());
     }
@@ -238,18 +223,16 @@ public class PublishProfilePictureActivity extends XmppActivity {
                 this.support = this.account.getXmppConnection().getFeatures().pep();
             }
             if (this.avatarUri == null) {
-                if (this.account.getAvatar() != null
-                        || this.defaultUri == null) {
+                if (this.account.getAvatar() != null || this.defaultUri == null) {
                     this.avatar.setImageBitmap(avatarService().get(account, getPixel(Config.AVATAR_SIZE)));
                     if (this.defaultUri != null) {
-                        this.avatar
-                                .setOnLongClickListener(this.backToDefaultListener);
+                        this.avatar.setOnLongClickListener(this.backToDefaultListener);
                     } else {
                         this.secondaryHint.setVisibility(View.INVISIBLE);
                     }
                     if (!support) {
-                        this.hintOrWarning
-                                .setTextColor(getWarningTextColor());
+                        this.hintOrWarning.setVisibility(View.VISIBLE);
+                        this.hintOrWarning.setTextColor(getWarningTextColor());
                         if (account.getStatus() == Account.State.ONLINE) {
                             this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
                         } else {
@@ -295,19 +278,19 @@ public class PublishProfilePictureActivity extends XmppActivity {
 
         if (bm == null) {
             disablePublishButton();
+            this.hintOrWarning.setVisibility(View.VISIBLE);
             this.hintOrWarning.setTextColor(getWarningTextColor());
-            this.hintOrWarning
-                    .setText(R.string.error_publish_avatar_converting);
+            this.hintOrWarning.setText(R.string.error_publish_avatar_converting);
             return;
         }
         this.avatar.setImageBitmap(bm);
         if (support) {
             enablePublishButton();
             this.publishButton.setText(R.string.publish);
-            this.hintOrWarning.setText(R.string.publish_avatar_explanation);
-            this.hintOrWarning.setTextColor(getPrimaryTextColor());
+            this.hintOrWarning.setVisibility(View.INVISIBLE);
         } else {
             disablePublishButton();
+            this.hintOrWarning.setVisibility(View.VISIBLE);
             this.hintOrWarning.setTextColor(getWarningTextColor());
             if (account.getStatus() == Account.State.ONLINE) {
                 this.hintOrWarning.setText(R.string.error_publish_avatar_no_server_support);
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 7051233b5..3c7971b1e 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -101,7 +101,6 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
                     android:minLines="3"
-                    android:text="@string/publish_avatar_explanation"
                     android:textColor="@color/black87"
                     android:textSize="?attr/TextSizeBody"
                     android:textAlignment="center"
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 032bc38d8..72daf4c3f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -242,8 +242,7 @@
   <string name="add_back">Auch hinzufügen</string>
   <string name="publish">Veröffentlichen</string>
   <string name="touch_to_choose_picture">Profilbild antippen, um Bild aus Galerie auszuwählen</string>
-  <string name="publish_avatar_explanation">Achtung: Jeder, der deinen Status sehen darf, sieht auch dein Profilbild.</string>
-  <string name="publishing">Veröffentliche…</string>
+    <string name="publishing">Veröffentliche…</string>
   <string name="error_publish_avatar_server_reject">Der Server hat die Veröffentlichung des Profilbildes abgelehnt.</string>
   <string name="error_publish_avatar_converting">Bei der Konvertierung des Profilbildes lief etwas schief.</string>
   <string name="error_saving_avatar">Avatar kann nicht gespeichert werden</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 045c5213f..b2d4e57a7 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -242,8 +242,7 @@
   <string name="add_back">Añadir contacto</string>
   <string name="publish">Publicar</string>
   <string name="touch_to_choose_picture">Pulsa para seleccionar una imagen de la galería</string>
-  <string name="publish_avatar_explanation">Nota: Todos tus contactos podrán ver esta imagen.</string>
-  <string name="publishing">Publicando…</string>
+    <string name="publishing">Publicando…</string>
   <string name="error_publish_avatar_server_reject">El servidor rechazó la publicación</string>
   <string name="error_publish_avatar_converting">Se ha producido un error mientras se convertía la imagen</string>
   <string name="error_saving_avatar">No se ha podido guardar la imagen de perfil en disco</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 8712404a7..66b532ca2 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -227,7 +227,6 @@
   <string name="add_back">Ré-ajouter</string>
   <string name="publish">Publier</string>
   <string name="touch_to_choose_picture">Toucher l\'avatar pour choisir une image depuis la galerie.</string>
-  <string name="publish_avatar_explanation">Note : toutes les personnes ayant souscrit à vos mises jour de disponibilité verront cette image.</string>
   <string name="publishing">Mise à jour…</string>
   <string name="error_publish_avatar_server_reject">Le serveur a rejeté votre publication</string>
   <string name="error_publish_avatar_converting">Une erreur s\'est produite pendant la conversion de votre image.</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c9e9dd6a8..8a3dbeed3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -241,7 +241,6 @@
     <string name="add_back">Add back</string>
     <string name="publish">Publish</string>
     <string name="touch_to_choose_picture">Touch avatar to select picture from gallery</string>
-    <string name="publish_avatar_explanation">Please note: Everyone subscribed to your presence updates will be allowed to see this picture.</string>
     <string name="publishing">Publishing…</string>
     <string name="error_publish_avatar_server_reject">The server rejected your publication</string>
     <string name="error_publish_avatar_converting">Something went wrong while converting your picture</string>