Merge pull request #1066 from UriahShaulMandel/master

Update translations
UriahShaulMandel · Sep 8, 2021 · ad3d58c · ad3d58c
2 parents 9e3d54d + 8a59676
commit ad3d58c
Show file tree

Hide file tree

Showing 10 changed files with 80 additions and 110 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,14 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+- package-ecosystem: gradle
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+    timezone: Europe/London
+  open-pull-requests-limit: 10
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ android:
     - sys-img-armeabi-v7a-android-22
 
 jdk:
-  - oraclejdk8
+  - oraclejdk11
 before_script:
   - pwd
   - chmod +x gradlew

diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ A platform which replaces the phone's interface to a bigger, simpler and friendl
 
 ## Second Version
 
-[<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Google Play Download" height="80">](https://play.google.com/store/apps/details?id=com.bald.uriah.baldphone.gp)
+[<img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png" alt="Google Play Download" height="82">](https://play.google.com/store/apps/details?id=com.bald.uriah.baldphone.gp)
 
 * Note: Google Play version does not contain the Recent Calls feature.
 

diff --git a/...src/androidTest/java/com/bald/uriah/baldphone/screenshots/ContactsActivityScreenshot.java b/...src/androidTest/java/com/bald/uriah/baldphone/screenshots/ContactsActivityScreenshot.java
@@ -52,12 +52,6 @@ public void test() {
 
     }
 
-    @Override
-    protected void cleanupAfterTest() {
-        super.cleanupAfterTest();
-        TestUtils.deleteAllContactsInEmulator(getInstrumentation().getTargetContext().getApplicationContext());
-    }
-
     @Override
     protected Class<ContactsActivity> activity() {
         return ContactsActivity.class;

diff --git a/.../androidTest/java/com/bald/uriah/baldphone/screenshots/RecentCallsActivityScreenshot.java b/.../androidTest/java/com/bald/uriah/baldphone/screenshots/RecentCallsActivityScreenshot.java
@@ -85,7 +85,6 @@ public void test() {
     @Override
     protected void cleanupAfterTest() {
         super.cleanupAfterTest();
-        TestUtils.deleteAllContactsInEmulator(getInstrumentation().getTargetContext().getApplicationContext());
     }
 
     @Override

diff --git a/app/src/androidTest/java/com/bald/uriah/baldphone/screenshots/TestUtils.java b/app/src/androidTest/java/com/bald/uriah/baldphone/screenshots/TestUtils.java
diff --git a/app/src/main/java/com/bald/uriah/baldphone/activities/FeedbackActivity.java b/app/src/main/java/com/bald/uriah/baldphone/activities/FeedbackActivity.java
@@ -16,6 +16,8 @@
 
 package com.bald.uriah.baldphone.activities;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.widget.EditText;
 
@@ -24,8 +26,6 @@
 import com.bald.uriah.baldphone.R;
 import com.bald.uriah.baldphone.utils.BaldToast;
 
-import org.acra.ACRA;
-
 public class FeedbackActivity extends BaldActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -37,19 +37,26 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             if (text.length() == 0)
                 BaldToast.from(v.getContext()).setType(BaldToast.TYPE_ERROR).setText(R.string.feedback_cannot_be_empty).show();
             else {
-                ACRA.getErrorReporter().handleSilentException(new FeedbackException(String.valueOf(text)));
-                BaldToast.from(getApplicationContext()).setText(R.string.feedback_sent_successfully).show();
-                finish();
+                Intent intent =
+                        new Intent(Intent.ACTION_SENDTO)
+                                .setData(Uri.parse("mailto:"))
+                                .putExtra(Intent.EXTRA_EMAIL, new String[]{"baldphone.contact@gmail.com"})
+                                .putExtra(Intent.EXTRA_SUBJECT, "BaldPhone feedback")
+                                .putExtra(Intent.EXTRA_TEXT, String.valueOf(text));
+                if (intent.resolveActivity(getPackageManager()) != null) {
+                    startActivity(intent);
+                    finish();
+                } else {
+                    // No mail client, weird!
+                    BaldToast.from(this)
+                            .setText(R.string.mail_application_not_found)
+                            .setType(BaldToast.TYPE_ERROR)
+                            .show();
+                }
             }
         });
     }
 
-    private final static class FeedbackException extends Exception {
-        FeedbackException(String message) {
-            super(message);
-        }
-    }
-
     @Override
     protected int requiredPermissions() {
         return PERMISSION_NONE;

diff --git a/app/src/main/java/com/bald/uriah/baldphone/utils/BaldToast.java b/app/src/main/java/com/bald/uriah/baldphone/utils/BaldToast.java
@@ -128,7 +128,7 @@ public void show() {
         if (!built)
             build();
         toast.show();
-        if (duration == -1) {
+        if (duration == LENGTH_SEC) {
             new Handler()
                     .postDelayed(() -> toast.cancel(), D.SECOND);
         }

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -404,6 +404,7 @@
     <string name="appear_on_top">Appear on top</string>
     <string name="appear_on_top_subtext">This permission is required on new version of android in order to show alarms and reminders when the screen is closed</string>
 
+    <string name="mail_application_not_found">Mail application not found!</string>
 
     <string-array name="names_for_screenshots">
         <item>The Godfather</item>