Skip to content

Commit b4d06aa

Browse files
DenBond7DenBond7
committed
Renamed some files.
1 parent 528c9f7 commit b4d06aa

13 files changed

+61
-63
lines changed

‎FlowCrypt/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,12 @@
4444
android:screenOrientation="portrait" />
4545

4646
<activity
47-
android:name=".ui.activity.SecureComposeActivity"
47+
android:name=".ui.activity.ComposeActivity"
4848
android:label="@string/compose"
4949
android:screenOrientation="portrait" />
5050

5151
<activity
52-
android:name=".ui.activity.SecureReplyActivity"
52+
android:name=".ui.activity.ReplyActivity"
5353
android:label="@string/security_reply"
5454
android:screenOrientation="portrait" />
5555

‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureComposeActivity.java‎ renamed to ‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ComposeActivity.java‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@
1212
import com.flowcrypt.email.R;
1313
import com.flowcrypt.email.model.MessageEncryptionType;
1414
import com.flowcrypt.email.ui.activity.base.BaseSendingMessageActivity;
15-
import com.flowcrypt.email.ui.activity.fragment.SecureComposeFragment;
15+
import com.flowcrypt.email.ui.activity.fragment.ComposeFragment;
1616

1717

1818
/**
19-
* This activity describes a logic of send encrypted message.
19+
* This activity describes a logic of send encrypted or standard message.
2020
*
2121
* @author DenBond7
2222
* Date: 08.05.2017
2323
* Time: 14:44
2424
* E-mail: [email protected]
2525
*/
26-
public class SecureComposeActivity extends BaseSendingMessageActivity {
26+
public class ComposeActivity extends BaseSendingMessageActivity {
2727
private View layoutContent;
2828

2929
@Override
@@ -44,41 +44,39 @@ public void onCreate(Bundle savedInstanceState) {
4444

4545
@Override
4646
public void notifyUserAboutErrorWhenSendMessage() {
47-
SecureComposeFragment secureComposeFragment = (SecureComposeFragment)
48-
getSupportFragmentManager()
49-
.findFragmentById(R.id.secureComposeFragment);
50-
if (secureComposeFragment != null) {
51-
secureComposeFragment.notifyUserAboutErrorWhenSendMessage();
47+
ComposeFragment composeFragment = (ComposeFragment) getSupportFragmentManager().findFragmentById(
48+
R.id.composeFragment);
49+
if (composeFragment != null) {
50+
composeFragment.notifyUserAboutErrorWhenSendMessage();
5251
}
5352
}
5453

5554
@Override
5655
public boolean isCanFinishActivity() {
57-
SecureComposeFragment secureComposeFragment = (SecureComposeFragment)
58-
getSupportFragmentManager()
59-
.findFragmentById(R.id.secureComposeFragment);
56+
ComposeFragment composeFragment = (ComposeFragment) getSupportFragmentManager().findFragmentById(
57+
R.id.composeFragment);
6058

61-
return secureComposeFragment != null && !secureComposeFragment.isMessageSendingNow();
59+
return composeFragment != null && !composeFragment.isMessageSendingNow();
6260
}
6361

6462
@Override
6563
protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e) {
66-
SecureComposeFragment secureComposeFragment = (SecureComposeFragment)
67-
getSupportFragmentManager().findFragmentById(R.id.secureComposeFragment);
64+
ComposeFragment composeFragment = (ComposeFragment) getSupportFragmentManager().findFragmentById(
65+
R.id.composeFragment);
6866

69-
if (secureComposeFragment != null) {
70-
secureComposeFragment.onErrorOccurred(requestCode, errorType, e);
67+
if (composeFragment != null) {
68+
composeFragment.onErrorOccurred(requestCode, errorType, e);
7169
}
7270
}
7371

7472
@Override
7573
protected void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType
7674
messageEncryptionType) {
77-
SecureComposeFragment secureComposeFragment = (SecureComposeFragment)
78-
getSupportFragmentManager().findFragmentById(R.id.secureComposeFragment);
75+
ComposeFragment composeFragment = (ComposeFragment) getSupportFragmentManager().findFragmentById(
76+
R.id.composeFragment);
7977

80-
if (secureComposeFragment != null) {
81-
secureComposeFragment.onMessageEncryptionTypeChange(messageEncryptionType);
78+
if (composeFragment != null) {
79+
composeFragment.onMessageEncryptionTypeChange(messageEncryptionType);
8280
}
8381
}
8482

‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/EmailManagerActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public void onLoaderReset(Loader<Cursor> loader) {
273273
public void onClick(View v) {
274274
switch (v.getId()) {
275275
case R.id.floatActionButtonCompose:
276-
Intent composeActivityIntent = new Intent(this, SecureComposeActivity.class);
276+
Intent composeActivityIntent = new Intent(this, ComposeActivity.class);
277277
composeActivityIntent.putExtra(BaseSendingMessageActivity.EXTRA_KEY_ACCOUNT_EMAIL,
278278
account.name);
279279
startActivity(composeActivityIntent);

‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/SecureReplyActivity.java‎ renamed to ‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/ReplyActivity.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@
1515
import com.flowcrypt.email.api.email.model.IncomingMessageInfo;
1616
import com.flowcrypt.email.model.MessageEncryptionType;
1717
import com.flowcrypt.email.ui.activity.base.BaseSendingMessageActivity;
18-
import com.flowcrypt.email.ui.activity.fragment.SecureReplyFragment;
18+
import com.flowcrypt.email.ui.activity.fragment.ReplyFragment;
1919
import com.flowcrypt.email.util.GeneralUtil;
2020

2121
/**
22-
* This activity describes a logic of send encrypted message as a reply.
22+
* This activity describes a logic of send encrypted or standard message as a reply.
2323
*
2424
* @author DenBond7
2525
* Date: 10.05.2017
2626
* Time: 09:11
2727
* E-mail: [email protected]
2828
*/
29-
public class SecureReplyActivity extends BaseSendingMessageActivity {
29+
public class ReplyActivity extends BaseSendingMessageActivity {
3030

3131
public static final String EXTRA_KEY_INCOMING_MESSAGE_INFO = GeneralUtil.generateUniqueExtraKey
32-
("EXTRA_KEY_INCOMING_MESSAGE_INFO", SecureReplyActivity.class);
32+
("EXTRA_KEY_INCOMING_MESSAGE_INFO", ReplyActivity.class);
3333

3434
private View layoutContent;
3535

3636
public static Intent generateIntent(Context context, IncomingMessageInfo incomingMessageInfo,
3737
MessageEncryptionType messageEncryptionType) {
3838

39-
Intent intent = new Intent(context, SecureReplyActivity.class);
39+
Intent intent = new Intent(context, ReplyActivity.class);
4040
intent.putExtra(EXTRA_KEY_INCOMING_MESSAGE_INFO, incomingMessageInfo);
4141
intent.putExtra(EXTRA_KEY_MESSAGE_ENCRYPTION_TYPE, messageEncryptionType);
4242
return intent;
@@ -64,20 +64,20 @@ public void onCreate(Bundle savedInstanceState) {
6464

6565
@Override
6666
public void notifyUserAboutErrorWhenSendMessage() {
67-
SecureReplyFragment secureReplyFragment = (SecureReplyFragment)
68-
getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);
67+
ReplyFragment replyFragment = (ReplyFragment)
68+
getSupportFragmentManager().findFragmentById(R.id.replyFragment);
6969

70-
if (secureReplyFragment != null) {
71-
secureReplyFragment.notifyUserAboutErrorWhenSendMessage();
70+
if (replyFragment != null) {
71+
replyFragment.notifyUserAboutErrorWhenSendMessage();
7272
}
7373
}
7474

7575
@Override
7676
public boolean isCanFinishActivity() {
77-
SecureReplyFragment secureReplyFragment = (SecureReplyFragment)
78-
getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);
77+
ReplyFragment replyFragment = (ReplyFragment)
78+
getSupportFragmentManager().findFragmentById(R.id.replyFragment);
7979

80-
return secureReplyFragment != null && !secureReplyFragment.isMessageSendingNow();
80+
return replyFragment != null && !replyFragment.isMessageSendingNow();
8181
}
8282

8383
@Override
@@ -92,22 +92,22 @@ protected String getStandardTitle() {
9292

9393
@Override
9494
protected void notifyFragmentAboutErrorFromService(int requestCode, int errorType, Exception e) {
95-
SecureReplyFragment secureReplyFragment = (SecureReplyFragment)
96-
getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);
95+
ReplyFragment replyFragment = (ReplyFragment)
96+
getSupportFragmentManager().findFragmentById(R.id.replyFragment);
9797

98-
if (secureReplyFragment != null) {
99-
secureReplyFragment.onErrorOccurred(requestCode, errorType, e);
98+
if (replyFragment != null) {
99+
replyFragment.onErrorOccurred(requestCode, errorType, e);
100100
}
101101
}
102102

103103
@Override
104104
protected void notifyFragmentAboutChangeMessageEncryptionType(MessageEncryptionType
105105
messageEncryptionType) {
106-
SecureReplyFragment secureReplyFragment = (SecureReplyFragment)
107-
getSupportFragmentManager().findFragmentById(R.id.secureReplyFragment);
106+
ReplyFragment replyFragment = (ReplyFragment)
107+
getSupportFragmentManager().findFragmentById(R.id.replyFragment);
108108

109-
if (secureReplyFragment != null) {
110-
secureReplyFragment.onMessageEncryptionTypeChange(messageEncryptionType);
109+
if (replyFragment != null) {
110+
replyFragment.onMessageEncryptionTypeChange(messageEncryptionType);
111111
}
112112
}
113113
}

‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureComposeFragment.java‎ renamed to ‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ComposeFragment.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
import java.util.List;
4646

4747
/**
48-
* This fragment describe a logic of sent an encrypted message.
48+
* This fragment describe a logic of sent an encrypted or standard message.
4949
*
5050
* @author DenBond7
5151
* Date: 08.05.2017
5252
* Time: 14:44
5353
* E-mail: [email protected]
5454
*/
55-
public class SecureComposeFragment extends BaseSendSecurityMessageFragment implements View
55+
public class ComposeFragment extends BaseSendSecurityMessageFragment implements View
5656
.OnFocusChangeListener {
5757
private NachoTextView recipientEditTextView;
5858
private EditText editTextEmailSubject;
@@ -63,7 +63,7 @@ public class SecureComposeFragment extends BaseSendSecurityMessageFragment imple
6363

6464
private ContactsDaoSource contactsDaoSource;
6565

66-
public SecureComposeFragment() {
66+
public ComposeFragment() {
6767
contactsDaoSource = new ContactsDaoSource();
6868
}
6969

@@ -178,7 +178,7 @@ public void onClick(View v) {
178178
if (GeneralUtil.isInternetConnectionAvailable(getContext())) {
179179
getLoaderManager().restartLoader(
180180
R.id.loader_id_update_info_about_pgp_contacts, null,
181-
SecureComposeFragment.this);
181+
ComposeFragment.this);
182182
} else {
183183
showInfoSnackbar(getView(), getString(R.string
184184
.internet_connection_is_not_available));

‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/MessageDetailsFragment.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
import com.flowcrypt.email.model.messages.MessagePartPgpPublicKey;
4545
import com.flowcrypt.email.model.results.LoaderResult;
4646
import com.flowcrypt.email.ui.activity.MessageDetailsActivity;
47-
import com.flowcrypt.email.ui.activity.SecureReplyActivity;
47+
import com.flowcrypt.email.ui.activity.ReplyActivity;
4848
import com.flowcrypt.email.ui.activity.base.BaseSendingMessageActivity;
4949
import com.flowcrypt.email.ui.activity.base.BaseSyncActivity;
5050
import com.flowcrypt.email.ui.activity.fragment.base.BaseGmailFragment;
@@ -381,7 +381,7 @@ private void runSecurityReplyActivity() {
381381
}
382382
}
383383

384-
Intent intent = SecureReplyActivity.generateIntent(getContext(), incomingMessageInfo, messageEncryptionType);
384+
Intent intent = ReplyActivity.generateIntent(getContext(), incomingMessageInfo, messageEncryptionType);
385385
intent.putExtra(BaseSendingMessageActivity.EXTRA_KEY_ACCOUNT_EMAIL, generalMessageDetails.getEmail());
386386
startActivity(intent);
387387
}

‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/SecureReplyFragment.java‎ renamed to ‎FlowCrypt/src/main/java/com/flowcrypt/email/ui/activity/fragment/ReplyFragment.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import com.flowcrypt.email.database.dao.source.ContactsDaoSource;
2727
import com.flowcrypt.email.js.PgpContact;
2828
import com.flowcrypt.email.model.MessageEncryptionType;
29-
import com.flowcrypt.email.ui.activity.SecureReplyActivity;
29+
import com.flowcrypt.email.ui.activity.ReplyActivity;
3030
import com.flowcrypt.email.ui.activity.base.BaseSendingMessageActivity;
3131
import com.flowcrypt.email.ui.activity.fragment.base.BaseSendSecurityMessageFragment;
3232
import com.flowcrypt.email.util.GeneralUtil;
@@ -35,14 +35,14 @@
3535
import java.util.List;
3636

3737
/**
38-
* This fragment describe a logic of sent an encrypted message as a reply.
38+
* This fragment describe a logic of sent an encrypted or standard message as a reply.
3939
*
4040
* @author DenBond7
4141
* Date: 10.05.2017
4242
* Time: 09:11
4343
* E-mail: [email protected]
4444
*/
45-
public class SecureReplyFragment extends BaseSendSecurityMessageFragment {
45+
public class ReplyFragment extends BaseSendSecurityMessageFragment {
4646

4747
/**
4848
* This constant will be used when we create a reply message subject.
@@ -58,7 +58,7 @@ public class SecureReplyFragment extends BaseSendSecurityMessageFragment {
5858
private TextInputLayout textInputLayoutReplyEmailMessage;
5959
private FoldersManager.FolderType folderType;
6060

61-
public SecureReplyFragment() {
61+
public ReplyFragment() {
6262
}
6363

6464
@Override
@@ -81,7 +81,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
8181
super.onCreate(savedInstanceState);
8282
if (getActivity().getIntent() != null) {
8383
this.incomingMessageInfo = getActivity().getIntent().getParcelableExtra
84-
(SecureReplyActivity.EXTRA_KEY_INCOMING_MESSAGE_INFO);
84+
(ReplyActivity.EXTRA_KEY_INCOMING_MESSAGE_INFO);
8585
if (incomingMessageInfo != null && incomingMessageInfo.getFolder() != null) {
8686
this.folderType = FoldersManager.getFolderTypeForImapFodler(incomingMessageInfo.getFolder()
8787
.getAttributes());
@@ -179,7 +179,7 @@ public void onClick(View v) {
179179
if (GeneralUtil.isInternetConnectionAvailable(getContext())) {
180180
getLoaderManager().restartLoader(
181181
R.id.loader_id_update_info_about_pgp_contacts, null,
182-
SecureReplyFragment.this);
182+
ReplyFragment.this);
183183
} else {
184184
showInfoSnackbar(getView(), getString(R.string
185185
.internet_connection_is_not_available));

‎FlowCrypt/src/main/res/layout/activity_secure_compose.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
android:id="@+id/screenContent"
1010
android:layout_width="match_parent"
1111
android:layout_height="match_parent"
12-
tools:context="com.flowcrypt.email.ui.activity.SecureComposeActivity">
12+
tools:context="com.flowcrypt.email.ui.activity.ComposeActivity">
1313

1414
<include layout="@layout/toolbar" />
1515

‎FlowCrypt/src/main/res/layout/activity_security_reply.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:tools="http://schemas.android.com/tools"
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent"
11-
tools:context="com.flowcrypt.email.ui.activity.SecureReplyActivity">
11+
tools:context="com.flowcrypt.email.ui.activity.ReplyActivity">
1212

1313
<include layout="@layout/toolbar" />
1414

‎FlowCrypt/src/main/res/layout/activity_settings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:tools="http://schemas.android.com/tools"
99
android:layout_width="match_parent"
1010
android:layout_height="match_parent"
11-
tools:context="com.flowcrypt.email.ui.activity.SecureComposeActivity">
11+
tools:context="com.flowcrypt.email.ui.activity.ComposeActivity">
1212

1313
<include layout="@layout/toolbar" />
1414

0 commit comments

Comments
 (0)