Added use the right variant of strings when compose different messages.. | Close #72

DenBond7 · DenBond7 · commit bed27cb293f6 · 2017-08-10T15:32:38.000+03:00
diff --git a/FlowCrypt/src/main/AndroidManifest.xml b/FlowCrypt/src/main/AndroidManifest.xml
@@ -45,7 +45,7 @@
 
         <activity
             android:name=".ui.activity.SecureComposeActivity"
-            android:label="@string/secure_compose"
+            android:label="@string/compose"
             android:screenOrientation="portrait" />
 
         <activity
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureComposeActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureComposeActivity.java
@@ -10,6 +10,7 @@
 import android.view.View;
 
 import com.flowcrypt.email.R;
+import com.flowcrypt.email.model.MessageEncryptionType;
 import com.flowcrypt.email.ui.activity.base.BaseSendingMessageActivity;
 import com.flowcrypt.email.ui.activity.fragment.SecureComposeFragment;
 
@@ -70,9 +71,20 @@ protected void notifyFragmentAboutErrorFromService(int requestCode, int errorTyp
         }
     }
 
+    @Override
+    protected void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType
+                                                                          messageEncryptionType) {
+        SecureComposeFragment secureComposeFragment = (SecureComposeFragment)
+                getSupportFragmentManager().findFragmentById(R.id.secureComposeFragment);
+
+        if (secureComposeFragment != null) {
+            secureComposeFragment.onMessageEncryptionTypeChange(messageEncryptionType);
+        }
+    }
+
     @Override
     protected String getSecurityTitle() {
-        return getString(R.string.secure_compose);
+        return getString(R.string.compose);
     }
 
     @Override
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureReplyActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureReplyActivity.java
@@ -99,4 +99,15 @@ protected void notifyFragmentAboutErrorFromService(int requestCode, int errorTyp
             secureReplyFragment.onErrorOccurred(requestCode, errorType);
         }
     }
+
+    @Override
+    protected void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType
+                                                                          messageEncryptionType) {
+        SecureReplyFragment secureReplyFragment = (SecureReplyFragment)
+                getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);
+
+        if (secureReplyFragment != null) {
+            secureReplyFragment.onMessageEncryptionTypeChange(messageEncryptionType);
+        }
+    }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSendingMessageActivity.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSendingMessageActivity.java
@@ -62,6 +62,9 @@ public abstract class BaseSendingMessageActivity extends BaseBackStackSyncActivi
 
     protected abstract void notifyFragmentAboutErrorFromService(int requestCode, int errorType);
 
+    protected abstract void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType
+                                                                                   messageEncryptionType);
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -79,7 +82,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
             if (messageEncryptionType == null) {
                 messageEncryptionType = MessageEncryptionType.ENCRYPTED;
             } else {
-                onChangeMessageEncryptedType(messageEncryptionType);
+                onMessageEncryptionTypeChange(messageEncryptionType);
             }
         }
     }
@@ -111,11 +114,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.menuActionSwitchType:
                 switch (messageEncryptionType) {
                     case ENCRYPTED:
-                        onChangeMessageEncryptedType(MessageEncryptionType.STANDARD);
+                        onMessageEncryptionTypeChange(MessageEncryptionType.STANDARD);
                         break;
 
                     case STANDARD:
-                        onChangeMessageEncryptedType(MessageEncryptionType.ENCRYPTED);
+                        onMessageEncryptionTypeChange(MessageEncryptionType.ENCRYPTED);
                         break;
                 }
                 return true;
@@ -177,7 +180,7 @@ public String getSenderEmail() {
     }
 
     @Override
-    public void onChangeMessageEncryptedType(MessageEncryptionType messageEncryptionType) {
+    public void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptionType) {
         this.messageEncryptionType = messageEncryptionType;
         switch (messageEncryptionType) {
             case ENCRYPTED:
@@ -198,6 +201,7 @@ public void onChangeMessageEncryptedType(MessageEncryptionType messageEncryption
         }
 
         invalidateOptionsMenu();
+        notifyFragmentAboutChangeMessageEncryptionType(messageEncryptionType);
     }
 
     @Override
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureComposeFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureComposeFragment.java
@@ -12,6 +12,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
+import android.support.design.widget.TextInputLayout;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
@@ -56,6 +57,7 @@ public class SecureComposeFragment extends BaseSendSecurityMessageFragment imple
     private NachoTextView recipientEditTextView;
     private EditText editTextEmailSubject;
     private EditText editTextEmailMessage;
+    private TextInputLayout textInputLayoutEmailMessage;
     private View layoutContent;
     private View progressBarCheckContactsDetails;
 
@@ -227,6 +229,21 @@ public void handleSuccessLoaderResult(int loaderId, Object result) {
         }
     }
 
+    @Override
+    public void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptionType) {
+        String emailMassageHint = null;
+        switch (messageEncryptionType) {
+            case ENCRYPTED:
+                emailMassageHint = getString(R.string.prompt_compose_security_email);
+                break;
+
+            case STANDARD:
+                emailMassageHint = getString(R.string.prompt_compose_standard_email);
+                break;
+        }
+        textInputLayoutEmailMessage.setHint(emailMassageHint);
+    }
+
     /**
      * Remove the current {@link PgpContact} from recipients.
      *
@@ -280,6 +297,8 @@ private void initViews(View view) {
 
         editTextEmailSubject = (EditText) view.findViewById(R.id.editTextEmailSubject);
         editTextEmailMessage = (EditText) view.findViewById(R.id.editTextEmailMessage);
+        textInputLayoutEmailMessage = (TextInputLayout) view.findViewById(R.id
+                .textInputLayoutEmailMessage);
 
         layoutContent = view.findViewById(R.id.scrollView);
         progressBarCheckContactsDetails = view.findViewById(R.id.progressBarCheckContactsDetails);
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureReplyFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureReplyFragment.java
@@ -9,6 +9,7 @@
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.design.widget.Snackbar;
+import android.support.design.widget.TextInputLayout;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -53,10 +54,26 @@ public class SecureReplyFragment extends BaseSendSecurityMessageFragment {
     private IncomingMessageInfo incomingMessageInfo;
     private View layoutContent;
     private View progressBarCheckContactsDetails;
+    private TextInputLayout textInputLayoutReplyEmailMessage;
 
     public SecureReplyFragment() {
     }
 
+    @Override
+    public void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptionType) {
+        String emailMassageHint = null;
+        switch (messageEncryptionType) {
+            case ENCRYPTED:
+                emailMassageHint = getString(R.string.prompt_compose_security_email);
+                break;
+
+            case STANDARD:
+                emailMassageHint = getString(R.string.prompt_compose_standard_email);
+                break;
+        }
+        textInputLayoutReplyEmailMessage.setHint(emailMassageHint);
+    }
+
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -188,10 +205,12 @@ private void updateViews() {
 
     private void initViews(View view) {
         this.textViewReplyRecipient = (TextView) view.findViewById(R.id.textViewReplyRecipient);
-        this.editTextReplyEmailMessage = (EditText) view.findViewById(R.id
-                .editTextReplyEmailMessage);
+        this.editTextReplyEmailMessage =
+                (EditText) view.findViewById(R.id.editTextReplyEmailMessage);
+        this.textInputLayoutReplyEmailMessage =
+                (TextInputLayout) view.findViewById(R.id.textInputLayoutReplyEmailMessage);
         this.layoutContent = view.findViewById(R.id.layoutForm);
-        this.progressBarCheckContactsDetails = view.findViewById(R.id
-                .progressBarCheckContactsDetails);
+        this.progressBarCheckContactsDetails =
+                view.findViewById(R.id.progressBarCheckContactsDetails);
     }
 }
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseSendSecurityMessageFragment.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/base/BaseSendSecurityMessageFragment.java
@@ -61,6 +61,8 @@ public BaseSendSecurityMessageFragment() {
         pgpContacts = new ArrayList<>();
     }
 
+    public abstract void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptionType);
+
     /**
      * Generate an outgoing message info from entered information by user.
      *
@@ -312,7 +314,7 @@ public boolean isMessageSendingNow() {
      * @param messageEncryptionType The new message encryption type.
      */
     protected void switchMessageEncryptionType(MessageEncryptionType messageEncryptionType) {
-        onChangeMessageEncryptedTypeListener.onChangeMessageEncryptedType(messageEncryptionType);
+        onChangeMessageEncryptedTypeListener.onMessageEncryptionTypeChange(messageEncryptionType);
     }
 
     /**
diff --git a/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/listeners/OnChangeMessageEncryptedTypeListener.java b/FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/listeners/OnChangeMessageEncryptedTypeListener.java
@@ -24,7 +24,7 @@ public interface OnChangeMessageEncryptedTypeListener {
      *
      * @param messageEncryptionType The new message encryption type.
      */
-    void onChangeMessageEncryptedType(MessageEncryptionType messageEncryptionType);
+    void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptionType);
 
     MessageEncryptionType getMessageEncryptionType();
 }
diff --git a/FlowCrypt/src/main/res/layout/fragment_secure_compose.xml b/FlowCrypt/src/main/res/layout/fragment_secure_compose.xml
@@ -77,6 +77,7 @@
             </android.support.design.widget.TextInputLayout>
 
             <android.support.design.widget.TextInputLayout
+                android:id="@+id/textInputLayoutEmailMessage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
diff --git a/FlowCrypt/src/main/res/layout/fragment_security_reply.xml b/FlowCrypt/src/main/res/layout/fragment_security_reply.xml
@@ -56,6 +56,7 @@
                 app:layout_constraintTop_toTopOf="@+id/textViewReplyRecipient" />
 
             <android.support.design.widget.TextInputLayout
+                android:id="@+id/textInputLayoutReplyEmailMessage"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/default_margin_content_small"
diff --git a/FlowCrypt/src/main/res/values/strings.xml b/FlowCrypt/src/main/res/values/strings.xml
@@ -7,11 +7,11 @@
 <resources>
     <string name="app_name">FlowCrypt</string>
 
-    <string name="secure_compose">Secure Compose</string>
     <string name="compose">Compose</string>
     <string name="prompt_recipient">Add recipient</string>
     <string name="prompt_subject">Subject</string>
     <string name="prompt_compose_security_email">Compose secure message</string>
+    <string name="prompt_compose_standard_email">Compose standard message</string>
     <string name="text_must_not_be_empty">Error: \"%1$s\" must not be empty!</string>
     <string name="send">Send</string>
     <string name="error_email_is_not_valid">Error: invalid email</string>

Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,15 @@ protected void notifyFragmentAboutErrorFromService(int requestCode, int errorTyp`
`99`	`99`	`secureReplyFragment.onErrorOccurred(requestCode, errorType);`
`100`	`100`	`}`
`101`	`101`	`}`
	`102`	`+`
	`103`	`+ @Override`
	`104`	`+ protected void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType`
	`105`	`+ messageEncryptionType) {`
	`106`	`+ SecureReplyFragment secureReplyFragment = (SecureReplyFragment)`
	`107`	`+ getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);`
	`108`	`+`
	`109`	`+ if (secureReplyFragment != null) {`
	`110`	`+ secureReplyFragment.onMessageEncryptionTypeChange(messageEncryptionType);`
	`111`	`+ }`
	`112`	`+ }`
`102`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ public BaseSendSecurityMessageFragment() {`
`61`	`61`	`pgpContacts = new ArrayList<>();`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ public abstract void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptionType);`
	`65`	`+`
`64`	`66`	`/**`
`65`	`67`	`* Generate an outgoing message info from entered information by user.`
`66`	`68`	`*`
`@@ -312,7 +314,7 @@ public boolean isMessageSendingNow() {`
`312`	`314`	`* @param messageEncryptionType The new message encryption type.`
`313`	`315`	`*/`
`314`	`316`	`protected void switchMessageEncryptionType(MessageEncryptionType messageEncryptionType) {`
`315`		`- onChangeMessageEncryptedTypeListener.onChangeMessageEncryptedType(messageEncryptionType);`
	`317`	`+ onChangeMessageEncryptedTypeListener.onMessageEncryptionTypeChange(messageEncryptionType);`
`316`	`318`	`}`
`317`	`319`
`318`	`320`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public interface OnChangeMessageEncryptedTypeListener {`
`24`	`24`	`*`
`25`	`25`	`* @param messageEncryptionType The new message encryption type.`
`26`	`26`	`*/`
`27`		`- void onChangeMessageEncryptedType(MessageEncryptionType messageEncryptionType);`
	`27`	`+ void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptionType);`
`28`	`28`
`29`	`29`	`MessageEncryptionType getMessageEncryptionType();`
`30`	`30`	`}`