also removed secure reply wording + refactor | #72

Author: Tom James Holub

.idea/codeStyleSettings.xml

@@ -50,7 +50,7 @@
 
         <activity
             android:name=".ui.activity.ReplyActivity"
-            android:label="@string/security_reply"
+            android:label="@string/reply"
             android:screenOrientation="portrait" />
 
         <activity

FlowCrypt/src/main/AndroidManifest.xml

@@ -80,14 +80,4 @@ protected void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionT
         }
     }
 
-    @Override
-    protected String getSecurityTitle() {
-        return getString(R.string.compose);
-    }
-
-    @Override
-    protected String getStandardTitle() {
-        return getString(R.string.compose);
-    }
-
 }

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ComposeActivity.java

@@ -80,16 +80,6 @@ public boolean isCanFinishActivity() {
         return replyFragment != null && !replyFragment.isMessageSendingNow();
     }
 
-    @Override
-    protected String getSecurityTitle() {
-        return getString(R.string.security_reply);
-    }
-
-    @Override
-    protected String getStandardTitle() {
-        return getString(R.string.reply);
-    }
-
     @Override
     protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e) {
         ReplyFragment replyFragment = (ReplyFragment)

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ReplyActivity.java

@@ -56,10 +56,6 @@ public abstract class BaseSendingMessageActivity extends BaseBackStackSyncActivi
 
     protected abstract boolean isCanFinishActivity();
 
-    protected abstract String getSecurityTitle();
-
-    protected abstract String getStandardTitle();
-
     protected abstract void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e);
 
     protected abstract void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType
@@ -185,17 +181,11 @@ public void onMessageEncryptionTypeChange(MessageEncryptionType messageEncryptio
         switch (messageEncryptionType) {
             case ENCRYPTED:
                 getAppBarLayout().setBackgroundColor(UIUtil.getColor(this, R.color.colorPrimary));
-                if (getSupportActionBar() != null) {
-                    getSupportActionBar().setTitle(getSecurityTitle());
-                }
                 getAppBarLayout().removeView(nonEncryptedHintView);
                 break;
 
             case STANDARD:
                 getAppBarLayout().setBackgroundColor(UIUtil.getColor(this, R.color.red));
-                if (getSupportActionBar() != null) {
-                    getSupportActionBar().setTitle(getStandardTitle());
-                }
                 getAppBarLayout().addView(nonEncryptedHintView);
                 break;
         }

FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/base/BaseSendingMessageActivity.java

@@ -147,7 +147,6 @@
     <string name="template_remove_recipient">Remove %1$s</string>
     <string name="recipient_does_not_use_pgp">Recipient doesn\'t use PGP</string>
     <string name="update">Update</string>
-    <string name="security_reply">Secure Reply</string>
     <string name="reply">Reply</string>
     <string name="import_public_key">Import Public Key</string>
     <string name="private_">Private</string>