stop phone call action

2022-10-03 20:16:56 +02:00 · 2022-10-03 20:16:56 +02:00 · 4abce042eb
parent 62034e1b10
commit 4abce042eb
10 changed files with 50 additions and 22 deletions
--- a/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
+++ b/app/src/main/java/com/jens/automation2/ActivityMainScreen.java
@ -270,9 +270,14 @@ public class ActivityMainScreen extends ActivityGeneric
 				activityMainScreenInstance.tvMainScreenNotePermissions.setVisibility(View.GONE);
 			}

-			if(Miscellaneous.restrictedFeaturesConfigured())
+			if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_fdroid) && Miscellaneous.restrictedFeaturesConfiguredFdroid())
 			{
-				activityMainScreenInstance.tvMainScreenNoteFeaturesFromOtherFlavor.setText(R.string.settingsReferringToRestrictedFeatures);
+				activityMainScreenInstance.tvMainScreenNoteFeaturesFromOtherFlavor.setText(R.string.settingsReferringToRestrictedFeaturesInFdroid);
+				activityMainScreenInstance.tvMainScreenNoteFeaturesFromOtherFlavor.setVisibility(View.VISIBLE);
+			}
+			else if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay) && Miscellaneous.restrictedFeaturesConfiguredGoogle())
+			{
+				activityMainScreenInstance.tvMainScreenNoteFeaturesFromOtherFlavor.setText(R.string.settingsReferringToRestrictedFeaturesInGoogle);
 				activityMainScreenInstance.tvMainScreenNoteFeaturesFromOtherFlavor.setVisibility(View.VISIBLE);
 			}
 			else
@ -283,14 +288,6 @@ public class ActivityMainScreen extends ActivityGeneric

 			if(Miscellaneous.googleToBlameForLocation(true))
 			{
-//				Intent intent = new Intent(AutomationService.this, ActivityDisplayLongMessage.class);
-//				intent.putExtra("longMessage", getResources().getString(R.string.locationEngineDisabledLong));
-//				PendingIntent pi = PendingIntent.getActivity(AutomationService.this, 0, intent, 0);
-//				if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1)
-//					Miscellaneous.createDismissableNotificationWithDelay(2200, getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
-//				else
-//					Miscellaneous.createDismissableNotification(getResources().getString(R.string.featuresDisabled), notificationIdLocationRestriction, pi);
-
 				activityMainScreenInstance.tvMainScreenNoteLocationImpossibleBlameGoogle.setText(R.string.locationEngineDisabledShort);
 				activityMainScreenInstance.tvMainScreenNoteLocationImpossibleBlameGoogle.setVisibility(View.VISIBLE);
 				activityMainScreenInstance.tvMainScreenNoteLocationImpossibleBlameGoogle.setOnClickListener(new OnClickListener()
@ -315,8 +312,7 @@ public class ActivityMainScreen extends ActivityGeneric
 				uiUpdateRunning = true;
 				activityMainScreenInstance.toggleService.setChecked(true);
 				uiUpdateRunning = false;
-				//		if(activityMainScreenInstance.hasWindowFocus())
-				//		{
+
 				try
 				{
 					PointOfInterest activePoi = PointOfInterest.getActivePoi();
--- a/app/src/main/java/com/jens/automation2/ActivityPermissions.java
+++ b/app/src/main/java/com/jens/automation2/ActivityPermissions.java
@ -248,6 +248,10 @@ public class ActivityPermissions extends Activity
                        if (!havePermission(s, context))
                            return true;
                }
+                else if((s.equalsIgnoreCase(Manifest.permission.CALL_PHONE) || s.equalsIgnoreCase(Manifest.permission.ANSWER_PHONE_CALLS)) && BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_googleplay))
+                {
+                    return false;
+                }
                else if(s.equalsIgnoreCase(Manifest.permission.ACTIVITY_RECOGNITION) || s.equalsIgnoreCase(permissionNameGoogleActivityDetection))
                {
                    if(!BuildConfig.FLAVOR.equalsIgnoreCase(AutomationService.flavor_name_fdroid))
--- a/app/src/main/java/com/jens/automation2/Miscellaneous.java
+++ b/app/src/main/java/com/jens/automation2/Miscellaneous.java
@ -82,7 +82,6 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
-import java.sql.Time;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@ -91,7 +90,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 import java.util.Scanner;
-import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
@ -1392,7 +1390,7 @@ public class Miscellaneous extends Service
 		return result;
 	}

-	public static boolean restrictedFeaturesConfigured()
+	public static boolean restrictedFeaturesConfiguredFdroid()
 	{
 		if(Rule.isAnyRuleUsing(Trigger.Trigger_Enum.activityDetection))
 		{
@ -1409,6 +1407,17 @@ public class Miscellaneous extends Service
 		return false;
 	}

+	public static boolean restrictedFeaturesConfiguredGoogle()
+	{
+		if(Rule.isAnyRuleUsing(Action.Action_Enum.startPhoneCall) || Rule.isAnyRuleUsing(Action.Action_Enum.stopPhoneCall))
+		{
+			if(BuildConfig.FLAVOR.equals(AutomationService.flavor_name_googleplay))
+				return true;
+		}
+
+		return false;
+	}
+
 	public static Element getXmlTree(String inputString) throws SAXException, IOException, ParserConfigurationException
 	{
 		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -512,7 +512,7 @@
    <string name="googleLocationChicaneryOld">Diese Anwendung sammelt Positionsdaten, um festzustellen, ob Sie sich gerade an einem der Orte aufhalten, die Sie definiert haben. Außerdem wird es benutzt, um Ihre Geschwindigkeit zu ermitteln, falls Sie diese in Regeln verwenden. Das wird auch dann gemacht, wenn das Programm nicht im Vordergrund ist (aber nur, wenn der Dienst aktiv ist).</string>
    <string name="error">Fehler</string>
    <string name="featureNotInFdroidVersion">Diese Funktion basiert auf nicht-freier Software (Google Bibliotheken). Daher ist sie in der F-Droid Version nicht verfügbar.</string>
-    <string name="settingsReferringToRestrictedFeatures">Ihre Einstellungen und Regeln verwenden derzeit nicht-freie Funktionen (Google Bibliotheken). Diese sind in der F-Droid Version nicht funktionsfähig. Das schließt die Erkennung Ihrer gegenwärtigen körperlichen Aktivität ein.</string>
+    <string name="settingsReferringToRestrictedFeaturesInFdroid">Ihre Einstellungen und Regeln verwenden derzeit nicht-freie Funktionen (Google Bibliotheken). Diese sind in der F-Droid Version nicht funktionsfähig. Das schließt die Erkennung Ihrer gegenwärtigen körperlichen Aktivität ein.</string>
    <string name="displayNewsOnMainScreen">Nachrichten auf dem Hauptbildschirm anzeigen</string>
    <string name="displayNewsOnMainScreenDescription">Nachrichten ausschließlich über diese Anwendung, wir sprechen von 1-2 pro Jahr, nicht mehr.</string>
    <string name="newsOptIn">Möchten Sie wichtige Nachrichten über diese Anwendung auf dem Hauptbildschirm angezeigt bekommen? Diese werden von der Webseite des Entwicklers heruntergeladen. Es gibt keine aufdringliche Benachrichtigung, etc., lediglich eine stille Anzeige auf dem Hauptbildschirm.</string>
@ -758,4 +758,7 @@
    <string name="startPhoneCall">Telefonnummer anrufen</string>
    <string name="android.permission.CALL_PHONE">Telefonnummer anrufen</string>
    <string name="makePhoneCallExplanation1">Hier können Sie eine Telefonnummer eingeben, die ohne weitere Aufforderung angerufen wird. Sie können dies verwenden, um Einstellungen vorzunehmen, z. B. Anpassungen an der Anrufweiterleitung usw. vorzunehmen. Bitte suchen Sie selbst nach den dafür benötigten Codes.</string>
+    <string name="endPhoneCall">Telefonanruf beenden</string>
+    <string name="android.permission.ANSWER_PHONE_CALLS">Telefonanruf beenden</string>
+    <string name="settingsReferringToRestrictedFeaturesInGoogle">Ihre Einstellungen und/oder Regeln verweisen derzeit auf Funktionen, die in der Google Play-Version nicht bereitgestellt werden können. Dazu gehört unter anderem alles, was mit Telefonaten und Textnachrichten zu tun hat.</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -576,7 +576,7 @@
    <string name="screenLockSoundNotice">Sonidos de bloqueo de pantalla no seran mas cambiados en dispositivos que usan Android 6 o mas nuevos. Cualquier ajuste aqui no va a funcionar en cualquier dirección.</string>
    <string name="googleLocationChicanery">Este app almacena datos de posición para activar reglas que necesitan la posición o la velocidad - incluso cuando la app esta cerrada o no en uso.</string>
    <string name="googleLocationChicaneryOld">Este app almacena datos de posición para determinar si actualmente esta en uno de los sitios que creó. Además estan usados para determinar su actual velocidad (si usa esta condición en reglas). Incluso cuando la app esta cerrada o no en uso (pero solo cuando el servicio esta iniciado).</string>
-    <string name="settingsReferringToRestrictedFeatures">Su configuración y/o reglas actualmente referencian caracteristicas no-libres no seran proveidas en la versión F-Droid. Esto incluye determinar su actual actividad fisica.</string>
+    <string name="settingsReferringToRestrictedFeaturesInFdroid">Su configuración y/o reglas actualmente referencian caracteristicas no-libres no seran proveidas en la versión F-Droid. Esto incluye determinar su actual actividad fisica.</string>
    <string name="filesHaveBeenMovedTo">Automation ahora usa otra ruta para guardar sus archivos. Todos sus archivos de Automation fueron desplazados aqui: \"%s\". El permiso del almacenamiento externo todavia no es necesario; puede revocarlo. Sera eliminado en una futura versión.</string>
    <string name="newsOptIn">Quiere recibir noticias (solo importantes) en la pantalla principal? Estas serán descargadas de la pagina del desarollador. No habrán notificaciones inoportunas, solo un texto en la pantalla principal cuando abra la app.</string>
    <string name="filesStoredAt">Config y archivos de log seran guardados en el directorio %1$s. Cliquee en este texto para abrir un administrador de archivos. Desafortunadamente solo funciona en un dispositivo rooted.\n\nPARA OTROS DISP.: Simplemente use el boton para crear un backup.</string>
@ -757,4 +757,7 @@
    <string name="startPhoneCall">Llamar al número de teléfono</string>
    <string name="android.permission.CALL_PHONE">Llamar al número de teléfono</string>
    <string name="makePhoneCallExplanation1">Aquí puede ingresar un número de teléfono al que se llamará sin más indicaciones. Puede usar esto para realizar configuraciones como realizar ajustes en el enrutamiento de llamadas, etc. Por favor, busque los códigos necesarios para esto por su cuenta.</string>
+    <string name="endPhoneCall">Terminar llamda de teléfono</string>
+    <string name="android.permission.ANSWER_PHONE_CALLS">Terminar llamda de teléfono</string>
+    <string name="settingsReferringToRestrictedFeaturesInGoogle">La configuración y/o las reglas hacen referencia a funciones que no se pueden proporcionar en la versión de Google Play. Entre otras cosas que incluye todo lo relacionado con llamadas telefónicas y mensajes de texto.</string>
 </resources>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -506,7 +506,7 @@
    <string name="manageLocations">Créer ou modifier des géolocalisations</string>
    <string name="error">Erreur</string>
    <string name="featureNotInFdroidVersion">Cette fonctionnalité est basée sur un logiciel non libre. Donc elle n\'est pas disponible dans la version F-Droid.</string>
-    <string name="settingsReferringToRestrictedFeatures">Vos réglages et/ou règles font référence à des fonctionnalités non libre qui ne sont pas disponibles dans la version F-Droid. Cela inclue la détection de votre activité physique.</string>
+    <string name="settingsReferringToRestrictedFeaturesInFdroid">Vos réglages et/ou règles font référence à des fonctionnalités non libre qui ne sont pas disponibles dans la version F-Droid. Cela inclue la détection de votre activité physique.</string>
    <string name="publishedOn">publié le</string>
    <string name="displayNewsOnMainScreen">Afficher les nouveautés de l\'application sur l\'écran principal</string>
    <string name="displayNewsOnMainScreenDescription">Les annonces concernent uniquement cette application, 1 à 2 fois par an, pas plus.</string>
@ -757,4 +757,7 @@
    <string name="startPhoneCall">Numéro de téléphone d\'appel</string>
    <string name="android.permission.CALL_PHONE">Numéro de téléphone d\'appel</string>
    <string name="makePhoneCallExplanation1">Ici, vous pouvez entrer un numéro de téléphone qui sera appelé sans autres invites. Vous pouvez l\'utiliser pour effectuer des paramètres tels que des ajustements au routage des appels, etc. Veuillez rechercher vous-même les codes requis pour cela.</string>
+    <string name="endPhoneCall">Mettre fin à l\'appel téléphonique</string>
+    <string name="android.permission.ANSWER_PHONE_CALLS">Mettre fin à l\'appel téléphonique</string>
+    <string name="settingsReferringToRestrictedFeaturesInGoogle">Vos paramètres et/ou règles font actuellement référence à des fonctionnalités qui ne peuvent pas être fournies dans la version Google Play. Entre autres choses, cela inclut tout ce qui concerne les appels téléphoniques et les messages texte.</string>
 </resources>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -453,7 +453,7 @@
    <string name="settingsCategoryNoiseLevelMeasurements">Misura del livello di rumore</string>
    <string name="settingsCategoryProcessMonitoring">Monitoraggio del processo</string>
    <string name="settingsErased">Impostazioni cancellate.</string>
-    <string name="settingsReferringToRestrictedFeatures">Le tue impostazioni e/o regole si riferiscono attualmente a funzioni non coperte da una licenza aperta e che pertanto non possono essere fornite nella versione F-Droid. Questo include il rilevamento della tua attuale attività fisica.</string>
+    <string name="settingsReferringToRestrictedFeaturesInFdroid">Le tue impostazioni e/o regole si riferiscono attualmente a funzioni non coperte da una licenza aperta e che pertanto non possono essere fornite nella versione F-Droid. Questo include il rilevamento della tua attuale attività fisica.</string>
    <string name="settingsSetToDefault">Impostazioni predefinite ripristinate.</string>
    <string name="settingsWillTakeTime">Alcune impostazioni non saranno applicate prima che alcune impostazioni contestuali cambino o che il servizio venga riavviato.</string>
    <string name="shareConfigAndLogExplanation">Questo creerà una email con la tua configurazione e i file di log allegati come file zip. Non sarà inviata automaticamente, dovrai premere \"invia\". Puoi anche cambiare il destinatario con te stesso, per esempio.</string>
@ -758,4 +758,7 @@
    <string name="startPhoneCall">Chiama il numero di telefono</string>
    <string name="android.permission.CALL_PHONE">Chiama il numero di telefono</string>
    <string name="makePhoneCallExplanation1">Qui è possibile inserire un numero di telefono che verrà chiamato senza ulteriori richieste. È possibile utilizzarlo per effettuare impostazioni come apportare modifiche al routing delle chiamate, ecc. Si prega di cercare i codici richiesti per questo da soli.</string>
+    <string name="android.permission.ANSWER_PHONE_CALLS">Termina telefonata</string>
+    <string name="endPhoneCall">Termina telefonata</string>
+    <string name="settingsReferringToRestrictedFeaturesInGoogle">Le tue impostazioni e/o regole fanno attualmente riferimento a funzioni che non possono essere fornite nella versione di Google Play. Tra le altre cose che include tutto ciò che riguarda le telefonate e i messaggi di testo.</string>
 </resources>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -500,7 +500,7 @@
    <string name="manageLocations">Locaties maken of bewerken</string>
    <string name="error">Fout</string>
    <string name="featureNotInFdroidVersion">Deze functie is gebaseerd op niet-vrije software. Daarom is is niet beschikbaar in de F-Droid versie.</string>
-    <string name="settingsReferringToRestrictedFeatures">Uw instellingen en of regels verwijzen momenteel naar niet-vrije functies die niet kunnen worden geleverd in de F-Droid versie. Dat omvat het detecteren van uw huidige fysieke activiteit.</string>
+    <string name="settingsReferringToRestrictedFeaturesInFdroid">Uw instellingen en of regels verwijzen momenteel naar niet-vrije functies die niet kunnen worden geleverd in de F-Droid versie. Dat omvat het detecteren van uw huidige fysieke activiteit.</string>
    <string name="publishedOn">gepubliceerd op</string>
    <string name="displayNewsOnMainScreen">Toepassingsnieuws weergeven op hoofdscherm</string>
    <string name="displayNewsOnMainScreenDescription">Aankondigingen over deze app alleen, we hebben het waarschijnlijk over 1-2 per jaar, niet meer.</string>
@ -756,5 +756,8 @@
    <string name="startPhoneCall">Telefoonnummer bellen</string>
    <string name="android.permission.CALL_PHONE">Telefoonnummer bellen</string>
    <string name="makePhoneCallExplanation1">Hier kunt u een telefoonnummer invoeren dat zonder verdere prompts wordt gebeld. U kunt dit gebruiken om instellingen aan te brengen, zoals het aanpassen van de gespreksroutering, enz.. Zoek zelf naar de codes die hiervoor nodig zijn.</string>
+    <string name="android.permission.ANSWER_PHONE_CALLS">Telefoongesprek beëindigen</string>
+    <string name="endPhoneCall">Telefoongesprek beëindigen</string>
+    <string name="settingsReferringToRestrictedFeaturesInGoogle">Uw instellingen en/of regels verwijzen momenteel naar functies die niet kunnen worden geleverd in de Google Play-versie. Dat omvat onder andere alles wat te maken heeft met telefoontjes en sms-berichten.</string>

 </resources>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -563,7 +563,7 @@
  <string name="manageLocations">Создание или редактирование местоположений</string>
  <string name="error">Ошибка</string>
  <string name="featureNotInFdroidVersion">Эта функция использует несвободное программное обеспечение, поэтому недоступна в версии F-Droid.</string>
-  <string name="settingsReferringToRestrictedFeatures">Ваши настройки и / или правила в настоящее время используют функциии, которые зависят от  несвободного программного обеспечения, они не могут быть использованы в версии F-Droid. Это включает в себя определение вашей текущей физической активности.</string>
+  <string name="settingsReferringToRestrictedFeaturesInFdroid">Ваши настройки и / или правила в настоящее время используют функциии, которые зависят от  несвободного программного обеспечения, они не могут быть использованы в версии F-Droid. Это включает в себя определение вашей текущей физической активности.</string>
  <string name="publishedOn">опубликовано на</string>
  <string name="displayNewsOnMainScreen">Отображение новостей приложения на главном экране</string>
  <string name="displayNewsOnMainScreenDescription">Объявления об этом приложении, 1-2 в год, не больше.</string>
@ -815,4 +815,7 @@
    <string name="startPhoneCall">Номер телефона</string>
  <string name="android.permission.CALL_PHONE">Номер телефона</string>
  <string name="makePhoneCallExplanation1">Здесь вы можете ввести номер телефона, который будет звонить без дальнейших запросов. Вы можете использовать это для внесения настроек, таких как внесение изменений в маршрутизацию вызовов и т. Д. Пожалуйста, найдите коды, необходимые для этого, самостоятельно.</string>
+    <string name="endPhoneCall">Завершение телефонного звонка</string>
+  <string name="android.permission.ANSWER_PHONE_CALLS">Завершение телефонного звонка</string>
+  <string name="settingsReferringToRestrictedFeaturesInGoogle">Ваши настройки и/или правила в настоящее время ссылаются на функции, которые не могут быть предоставлены в версии Google Play. Среди прочего, это включает в себя все, что связано с телефонными звонками и текстовыми сообщениями.</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -602,7 +602,8 @@
    <string name="manageLocations">Create or edit locations</string>
    <string name="error">Error</string>
    <string name="featureNotInFdroidVersion">This feature is based on non-free software. Therefore is is not available in the F-Droid version.</string>
-    <string name="settingsReferringToRestrictedFeatures">Your settings and or rules are currently referencing non-free features that cannot be provided in the F-Droid version. That includes detecting your current physical activity.</string>
+    <string name="settingsReferringToRestrictedFeaturesInFdroid">Your settings and or rules are currently referencing non-free features that cannot be provided in the F-Droid version. That includes detecting your current physical activity.</string>
+    <string name="settingsReferringToRestrictedFeaturesInGoogle">Your settings and or rules are currently referencing features that cannot be provided in the Google Play version. Among other things that includes anything related to phone calls and text messages.</string>
    <string name="publishedOn">published on</string>
    <string name="displayNewsOnMainScreen">Display application news on main screen</string>
    <string name="displayNewsOnMainScreenDescription">Announcements about this app only, we\'re probably talking about 1-2 per year, not more.</string>