Browse Source

Merge branch 'develop'

main
Distopico Vegan 6 years ago
parent
commit
1585426b4b
4 changed files with 25 additions and 1 deletions
  1. +5
    -0
      app/src/main/java/org/dystopia/email/ActivityView.java
  2. +6
    -0
      app/src/main/java/org/dystopia/email/FragmentMessages.java
  3. +4
    -1
      app/src/main/res/values-nl/strings.xml
  4. +10
    -0
      scripts/signed.sh

+ 5
- 0
app/src/main/java/org/dystopia/email/ActivityView.java View File

@ -717,6 +717,11 @@ public class ActivityView extends ActivityBase
return intent; return intent;
} }
/**
* Get Intent for invite to use SimpleEmail
*
* @return Intent with share/send action
*/
private Intent getIntentInvite() { private Intent getIntentInvite() {
Intent shareIntent = new Intent(); Intent shareIntent = new Intent();
shareIntent.setAction(Intent.ACTION_SEND); shareIntent.setAction(Intent.ACTION_SEND);


+ 6
- 0
app/src/main/java/org/dystopia/email/FragmentMessages.java View File

@ -1046,6 +1046,12 @@ public class FragmentMessages extends FragmentEx {
} }
} }
/**
* Handler when OnRefreshListener is called
*
* @param args a <code>Bundle</code> with account and folder
*/
private void onRefreshHandler(Bundle args) { private void onRefreshHandler(Bundle args) {
new SimpleTask<Boolean>() { new SimpleTask<Boolean>() {
@Override @Override


+ 4
- 1
app/src/main/res/values-nl/strings.xml View File

@ -257,4 +257,7 @@
<string name="title_show_details">Details tonen</string> <string name="title_show_details">Details tonen</string>
<string name="title_no_accounts_yet">Je hebt nog geen ingestelde accounts</string> <string name="title_no_accounts_yet">Je hebt nog geen ingestelde accounts</string>
<string name="title_no_identities_yet">Je hebt nog geen ingestelde identiteiten</string> <string name="title_no_identities_yet">Je hebt nog geen ingestelde identiteiten</string>
</resources>
<string name="title_try_subject">Probeer SimpleEmail</string>
<string name="title_try_text">Uitnodiging aan:</string>
</resources>

+ 10
- 0
scripts/signed.sh View File

@ -0,0 +1,10 @@
function prop {
grep "${1}" local.properties|cut -d'=' -f2
}
read -s -p "Key Password: " PASSWORD
RELEASE_STORE_FILE=$(prop "RELEASE_STORE_FILE")
RELEASE_KEY_ALIAS=$(prop "RELEASE_KEY_ALIAS")
./gradlew assembleRelease -Pandroid.injected.signing.store.file=$RELEASE_STORE_FILE -Pandroid.injected.signing.store.password=$PASSWORD -Pandroid.injected.signing.key.alias=$RELEASE_KEY_ALIAS -Pandroid.injected.signing.key.password=$PASSWORD

Loading…
Cancel
Save