Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request 'stop sending empty message && change version name on about tab' (#30) from empty_message_and_about into develop

Browse Source 
Reviewed-on: #30
This commit is contained in:
CiufudeanDani 2022-04-14 10:29:07 +00:00
commit e7b6d0b9c3
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
safeDispatch/src/main/java/com/safemobile/safedispatch/MessagesActivity.java
View File

@ -167,6 +167,8 @@ public class MessagesActivity extends Activity {
// button send message // button send message
imageButtonSend = findViewById(R.id.imageButtonSend); imageButtonSend = findViewById(R.id.imageButtonSend);
imageButtonSend.setOnClickListener(v -> { imageButtonSend.setOnClickListener(v -> {
if (editTextMsg.getText().toString().isEmpty())
return;
sendSMS(getScId(), editTextMsg.getText().toString()); sendSMS(getScId(), editTextMsg.getText().toString());
Toast.makeText(context, "Sending message...", Toast.LENGTH_SHORT).show(); Toast.makeText(context, "Sending message...", Toast.LENGTH_SHORT).show();
// disable send button and editBox // disable send button and editBox

3
safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
View File

@ -1225,7 +1225,8 @@ public class TabLayoutActivity extends AbstractSDParentActivity {
image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.mipmap.ic_launcher); image.setImageResource(AppParams.DEMO ? R.drawable.icon_demo : R.mipmap.ic_launcher);
TextView text = dialog.findViewById(R.id.text); TextView text = dialog.findViewById(R.id.text);
TextView text2 = dialog.findViewById(R.id.text2); TextView text2 = dialog.findViewById(R.id.text2);
text.setText(String.format("%s1.0.8", getString(R.string.version))); text.setText(getString(R.string.version) + " " + BuildConfig.VERSION_NAME);
text2.setText(String.format("%s: support@safemobile.com", getString(R.string.email))); text2.setText(String.format("%s: support@safemobile.com", getString(R.string.email)));
dialog.setCancelable(true); dialog.setCancelable(true);
dialog.setCanceledOnTouchOutside(true); dialog.setCanceledOnTouchOutside(true);