From 33311a59e3067cfa919d3fe6fe24bed6aee98b65 Mon Sep 17 00:00:00 2001 From: Domi04151309 Date: Mon, 8 Jun 2020 09:59:06 +0200 Subject: [PATCH 1/6] Ask for confirmation before hiding the app --- .../com/dosse/airpods/SettingsFragment.java | 26 ++++++++++++------- .../app/src/main/res/values-de/strings.xml | 3 +++ OpenPods/app/src/main/res/values/strings.xml | 3 +++ 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java b/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java index 9e60f1f..fd5267b 100644 --- a/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java +++ b/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java @@ -2,12 +2,14 @@ package com.dosse.airpods; import android.content.ComponentName; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; import android.os.Bundle; import android.widget.Toast; +import androidx.appcompat.app.AlertDialog; import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; @@ -31,17 +33,23 @@ public class SettingsFragment extends PreferenceFragmentCompat { mHideAppPreference = getPreferenceManager().findPreference("hideApp"); assert mHideAppPreference != null; mHideAppPreference.setOnPreferenceClickListener(preference -> { - PackageManager p = requireContext().getPackageManager(); - p.setComponentEnabledSetting(new ComponentName(context, MainActivity.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); - Toast.makeText(context, getString(R.string.hideClicked), Toast.LENGTH_LONG).show(); + AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); + builder.setTitle(R.string.hide_dialog); + builder.setMessage(R.string.hide_dialog_desc); + builder.setPositiveButton(R.string.hide_dialog_button, (dialogInterface, i) -> { + PackageManager p = requireContext().getPackageManager(); + p.setComponentEnabledSetting(new ComponentName(context, MainActivity.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); + Toast.makeText(context, getString(R.string.hideClicked), Toast.LENGTH_LONG).show(); - try { - context.openFileOutput("hidden", Context.MODE_PRIVATE).close(); - } catch (Throwable ignored) { - } + try { + context.openFileOutput("hidden", Context.MODE_PRIVATE).close(); + } catch (Throwable ignored) { } - enableDisableOptions(); - requireActivity().finish(); + enableDisableOptions(); + requireActivity().finish(); + }); + builder.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> { }); + builder.show(); return true; }); diff --git a/OpenPods/app/src/main/res/values-de/strings.xml b/OpenPods/app/src/main/res/values-de/strings.xml index d014143..cef6ce4 100644 --- a/OpenPods/app/src/main/res/values-de/strings.xml +++ b/OpenPods/app/src/main/res/values-de/strings.xml @@ -17,6 +17,9 @@ App verstecken Verstecke diese App vor dem Launcher Das Icon wird bald verschwinden + Sind Sie sich sicher? + Sind Sie sich sicher, dass Sie diese App verstecken möchten? Es kann nur durch erneutes Installieren der App wieder rückgängig gemacht werden. + Verstecken Über Entwickelt von Federico Dossena diff --git a/OpenPods/app/src/main/res/values/strings.xml b/OpenPods/app/src/main/res/values/strings.xml index 303a9f6..9780f11 100644 --- a/OpenPods/app/src/main/res/values/strings.xml +++ b/OpenPods/app/src/main/res/values/strings.xml @@ -18,6 +18,9 @@ Enable this if Bluetooth uses a lot of battery Hide app Hide this app from the launcher + Are you sure? + Are you sure that you want to hide the App? This can only be undone by reinstalling it. + Hide The icon will disappear soon About From ef43c22368196a3c0a7ace4aaacfd4f3d80b25bb Mon Sep 17 00:00:00 2001 From: Domi04151309 Date: Mon, 8 Jun 2020 10:02:00 +0200 Subject: [PATCH 2/6] Remove unnecessary import --- .../app/src/main/java/com/dosse/airpods/SettingsFragment.java | 1 - 1 file changed, 1 deletion(-) diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java b/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java index fd5267b..937e21e 100644 --- a/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java +++ b/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java @@ -2,7 +2,6 @@ package com.dosse.airpods; import android.content.ComponentName; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; From 6f674f5dbb490f7e0433d566b11f40a5a6f4830e Mon Sep 17 00:00:00 2001 From: Electric Date: Mon, 8 Jun 2020 19:46:31 +0300 Subject: [PATCH 3/6] Updated Hebrew translation. --- OpenPods/app/src/main/res/values-de/strings.xml | 2 +- OpenPods/app/src/main/res/values-iw-rIL/strings.xml | 3 +++ OpenPods/app/src/main/res/values/strings.xml | 8 ++++---- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/OpenPods/app/src/main/res/values-de/strings.xml b/OpenPods/app/src/main/res/values-de/strings.xml index cef6ce4..399b534 100644 --- a/OpenPods/app/src/main/res/values-de/strings.xml +++ b/OpenPods/app/src/main/res/values-de/strings.xml @@ -16,10 +16,10 @@ Aktiviere diesen Modus, wenn Bluetooth zu viel Batterieleistung erfordert App verstecken Verstecke diese App vor dem Launcher - Das Icon wird bald verschwinden Sind Sie sich sicher? Sind Sie sich sicher, dass Sie diese App verstecken möchten? Es kann nur durch erneutes Installieren der App wieder rückgängig gemacht werden. Verstecken + Das Icon wird bald verschwinden Über Entwickelt von Federico Dossena diff --git a/OpenPods/app/src/main/res/values-iw-rIL/strings.xml b/OpenPods/app/src/main/res/values-iw-rIL/strings.xml index 902c680..447b18f 100644 --- a/OpenPods/app/src/main/res/values-iw-rIL/strings.xml +++ b/OpenPods/app/src/main/res/values-iw-rIL/strings.xml @@ -16,6 +16,9 @@ הפעל אם Bluetooth משתמש בהרבה סוללה הסתר אפליקציה הסתר את האפליקציה ממסך הבית + האם אתה בטוח? + האם אתה בטוח שאתה רוצה להסתיר את האפליקציה? ניתן לבטל זאת רק על ידי התקנה מחדש + הסתר האפליקציה תוסתר בקרוב אודות diff --git a/OpenPods/app/src/main/res/values/strings.xml b/OpenPods/app/src/main/res/values/strings.xml index 9780f11..7317629 100644 --- a/OpenPods/app/src/main/res/values/strings.xml +++ b/OpenPods/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - + OpenPods This app lets you check the status of your AirPods on any Android device @@ -18,9 +18,9 @@ Enable this if Bluetooth uses a lot of battery Hide app Hide this app from the launcher - Are you sure? - Are you sure that you want to hide the App? This can only be undone by reinstalling it. - Hide + Are you sure? + Are you sure that you want to hide the App? This can only be undone by reinstalling it. + Hide The icon will disappear soon About From d5c10539e00d1e7887a816b5101bce578f664c73 Mon Sep 17 00:00:00 2001 From: Electric Date: Mon, 8 Jun 2020 19:49:37 +0300 Subject: [PATCH 4/6] Miscellaneous changes --- .../app/src/main/java/com/dosse/airpods/PodsService.java | 4 ++-- .../src/main/java/com/dosse/airpods/SettingsFragment.java | 8 +++++--- OpenPods/app/src/main/res/values-night-v29/colors.xml | 2 +- OpenPods/app/src/main/res/values-night/colors.xml | 2 +- OpenPods/app/src/main/res/values-v29/colors.xml | 2 +- OpenPods/app/src/main/res/values/colors.xml | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java index 0a98a7b..5536cca 100644 --- a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java +++ b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java @@ -80,7 +80,7 @@ public class PodsService extends Service { *

* After decoding a beacon, the status is written to leftStatus, rightStatus, caseStatus, chargeL, chargeR, chargeCase so that the NotificationThread can use the information */ - private static final ArrayList recentBeacons = new ArrayList<>(); + private static ArrayList recentBeacons = new ArrayList<>(); private static final long RECENT_BEACONS_MAX_T_NS = 10000000000L; //10s private void startAirPodsScanner () { @@ -294,7 +294,7 @@ public class PodsService extends Service { } } - private final NotificationManager mNotifyManager; + private NotificationManager mNotifyManager; @SuppressWarnings("WeakerAccess") public NotificationThread () { diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java b/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java index 937e21e..eb9c8f0 100644 --- a/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java +++ b/OpenPods/app/src/main/java/com/dosse/airpods/SettingsFragment.java @@ -2,6 +2,7 @@ package com.dosse.airpods; import android.content.ComponentName; import android.content.Context; +import android.content.DialogInterface; import android.content.Intent; import android.content.pm.PackageManager; import android.net.Uri; @@ -35,19 +36,20 @@ public class SettingsFragment extends PreferenceFragmentCompat { AlertDialog.Builder builder = new AlertDialog.Builder(requireContext()); builder.setTitle(R.string.hide_dialog); builder.setMessage(R.string.hide_dialog_desc); - builder.setPositiveButton(R.string.hide_dialog_button, (dialogInterface, i) -> { + builder.setPositiveButton(R.string.hide_dialog_button, (dialog, which) -> { PackageManager p = requireContext().getPackageManager(); p.setComponentEnabledSetting(new ComponentName(context, MainActivity.class), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP); Toast.makeText(context, getString(R.string.hideClicked), Toast.LENGTH_LONG).show(); try { context.openFileOutput("hidden", Context.MODE_PRIVATE).close(); - } catch (Throwable ignored) { } + } catch (Throwable ignored) { + } enableDisableOptions(); requireActivity().finish(); }); - builder.setNegativeButton(android.R.string.cancel, (dialogInterface, i) -> { }); + builder.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.dismiss()); builder.show(); return true; }); diff --git a/OpenPods/app/src/main/res/values-night-v29/colors.xml b/OpenPods/app/src/main/res/values-night-v29/colors.xml index 94e671c..20e0ec6 100644 --- a/OpenPods/app/src/main/res/values-night-v29/colors.xml +++ b/OpenPods/app/src/main/res/values-night-v29/colors.xml @@ -1,4 +1,4 @@ - @android:color/transparent + @android:color/transparent diff --git a/OpenPods/app/src/main/res/values-night/colors.xml b/OpenPods/app/src/main/res/values-night/colors.xml index 65a798e..fdf86b4 100644 --- a/OpenPods/app/src/main/res/values-night/colors.xml +++ b/OpenPods/app/src/main/res/values-night/colors.xml @@ -7,5 +7,5 @@ @android:color/primary_text_dark #000 - @android:color/darker_gray + @android:color/darker_gray diff --git a/OpenPods/app/src/main/res/values-v29/colors.xml b/OpenPods/app/src/main/res/values-v29/colors.xml index 94e671c..20e0ec6 100644 --- a/OpenPods/app/src/main/res/values-v29/colors.xml +++ b/OpenPods/app/src/main/res/values-v29/colors.xml @@ -1,4 +1,4 @@ - @android:color/transparent + @android:color/transparent diff --git a/OpenPods/app/src/main/res/values/colors.xml b/OpenPods/app/src/main/res/values/colors.xml index 99e7cfe..35dd4fd 100644 --- a/OpenPods/app/src/main/res/values/colors.xml +++ b/OpenPods/app/src/main/res/values/colors.xml @@ -7,5 +7,5 @@ @android:color/primary_text_light #FFF - #737373 + #737373 From 458fb236719a4bd7c61277948766b0722b0252a1 Mon Sep 17 00:00:00 2001 From: Electric Date: Mon, 8 Jun 2020 20:06:00 +0300 Subject: [PATCH 5/6] Updated to latest gradle --- OpenPods/gradle/wrapper/gradle-wrapper.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenPods/gradle/wrapper/gradle-wrapper.properties b/OpenPods/gradle/wrapper/gradle-wrapper.properties index cb4cfda..517f8f8 100644 --- a/OpenPods/gradle/wrapper/gradle-wrapper.properties +++ b/OpenPods/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 26 15:58:48 CET 2020 +#Mon Jun 08 20:04:20 IDT 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip From df687ac481e0274a177240efe8e15f5cbd518e89 Mon Sep 17 00:00:00 2001 From: Jens Peter Schaefer Date: Wed, 10 Jun 2020 01:51:47 +0200 Subject: [PATCH 6/6] Added Fix for Notification Visibility on locked Screens --- OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java index 5536cca..dd5002d 100644 --- a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java +++ b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java @@ -324,6 +324,7 @@ public class PodsService extends Service { mBuilder.setShowWhen(false); mBuilder.setOngoing(true); mBuilder.setSmallIcon(R.mipmap.notification_icon); + mBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC); for (; ; ) { /*&&System.currentTimeMillis()-lastSeenConnected