Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
81812eba1b |
@@ -82,8 +82,7 @@
|
|||||||
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
|
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
|
||||||
<uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
|
<uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
|
||||||
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
|
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
|
||||||
<uses-permission android:name="android.permission.TETHER_PRIVILEGED" />
|
|
||||||
dev.shadoe.delta.action.START_SOFT_AP
|
|
||||||
<uses-feature
|
<uses-feature
|
||||||
android:name="android.hardware.telephony"
|
android:name="android.hardware.telephony"
|
||||||
android:required="false" />
|
android:required="false" />
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ import android.content.Intent;
|
|||||||
import android.media.AudioManager;
|
import android.media.AudioManager;
|
||||||
import android.media.MediaPlayer;
|
import android.media.MediaPlayer;
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
import android.net.TetheringManager;
|
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.net.wifi.WifiManager;
|
import android.net.wifi.WifiManager;
|
||||||
import android.os.Build;
|
import android.os.Build;
|
||||||
@@ -74,8 +73,6 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.concurrent.Executors;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
@@ -544,7 +541,7 @@ public class Actions
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(Build.VERSION.SDK_INT < 36)
|
else
|
||||||
{
|
{
|
||||||
MyOnStartTetheringCallback cb = new MyOnStartTetheringCallback()
|
MyOnStartTetheringCallback cb = new MyOnStartTetheringCallback()
|
||||||
{
|
{
|
||||||
@@ -567,13 +564,6 @@ public class Actions
|
|||||||
else
|
else
|
||||||
mowm.stopTethering();
|
mowm.stopTethering();
|
||||||
}
|
}
|
||||||
else // from Android 16 onwards
|
|
||||||
{
|
|
||||||
if(desiredState)
|
|
||||||
Actions.WifiTethering.enable(context);
|
|
||||||
else
|
|
||||||
Actions.WifiTethering.disable(context);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1108,18 +1098,18 @@ public class Actions
|
|||||||
// {
|
// {
|
||||||
// ssf = new MySSLSocketFactory(ctx);
|
// ssf = new MySSLSocketFactory(ctx);
|
||||||
// ssf.setHostnameVerifier(SSLSocketFactory.STRICT_HOSTNAME_VERIFIER);
|
// ssf.setHostnameVerifier(SSLSocketFactory.STRICT_HOSTNAME_VERIFIER);
|
||||||
//
|
//
|
||||||
// char[] keystorePass="insecure".toCharArray(); //passphrase for keystore
|
// char[] keystorePass="insecure".toCharArray(); //passphrase for keystore
|
||||||
// KeyStore keyStore=KeyStore.getInstance("BKS");
|
// KeyStore keyStore=KeyStore.getInstance("BKS");
|
||||||
//
|
//
|
||||||
//// String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
|
//// String tmfAlgorithm = TrustManagerFactory.getDefaultAlgorithm();
|
||||||
// TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
|
// TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509");
|
||||||
// tmf.init(keyStore);
|
// tmf.init(keyStore);
|
||||||
//
|
//
|
||||||
// Miscellaneous.logEvent("i", "SSL Keystore", context.getCacheDir().toString(), 4);
|
// Miscellaneous.logEvent("i", "SSL Keystore", context.getCacheDir().toString(), 4);
|
||||||
// InputStream is = context.getResources().openRawResource(R.raw.keystore);
|
// InputStream is = context.getResources().openRawResource(R.raw.keystore);
|
||||||
// keyStore.load(is,keystorePass);
|
// keyStore.load(is,keystorePass);
|
||||||
//
|
//
|
||||||
// ctx.init(null, tmf.getTrustManagers(), null);
|
// ctx.init(null, tmf.getTrustManagers(), null);
|
||||||
// }
|
// }
|
||||||
// else
|
// else
|
||||||
@@ -1232,10 +1222,7 @@ public class Actions
|
|||||||
else if (startupType.equals(ActivityManageActionStartActivity.startByForegroundServiceString) && Build.VERSION.SDK_INT >= 26)
|
else if (startupType.equals(ActivityManageActionStartActivity.startByForegroundServiceString) && Build.VERSION.SDK_INT >= 26)
|
||||||
automationServerRef.startForegroundService(externalApplicationIntent);
|
automationServerRef.startForegroundService(externalApplicationIntent);
|
||||||
else
|
else
|
||||||
{
|
|
||||||
externalApplicationIntent.addCategory("");
|
|
||||||
automationServerRef.sendBroadcast(externalApplicationIntent);
|
automationServerRef.sendBroadcast(externalApplicationIntent);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@@ -2687,71 +2674,5 @@ public class Actions
|
|||||||
// }
|
// }
|
||||||
android.provider.Settings.Secure.putString(context.getContentResolver(), android.provider.Settings.Secure.LOCATION_MODE, String.valueOf(desiredState));
|
android.provider.Settings.Secure.putString(context.getContentResolver(), android.provider.Settings.Secure.LOCATION_MODE, String.valueOf(desiredState));
|
||||||
}
|
}
|
||||||
public static final class WifiTethering
|
|
||||||
{
|
|
||||||
private static final Executor EXECUTOR = Executors.newSingleThreadExecutor();
|
|
||||||
|
|
||||||
private WifiTethering()
|
|
||||||
{
|
|
||||||
// Utility class
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void enable(Context context)
|
|
||||||
{
|
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.BAKLAVA)
|
|
||||||
{
|
|
||||||
throw new UnsupportedOperationException("TetheringManager requires Android 16 / API 36");
|
|
||||||
}
|
|
||||||
|
|
||||||
TetheringManager tetheringManager = context.getSystemService(TetheringManager.class);
|
|
||||||
|
|
||||||
TetheringManager.TetheringRequest request = new TetheringManager.TetheringRequest.Builder(TetheringManager.TETHERING_WIFI).build();
|
|
||||||
|
|
||||||
tetheringManager.startTethering(request, EXECUTOR, new TetheringManager.StartTetheringCallback() {
|
|
||||||
@Override
|
|
||||||
public void onTetheringStarted()
|
|
||||||
{
|
|
||||||
// Wi-Fi hotspot enabled
|
|
||||||
Miscellaneous.logEvent("i", "Tethering start", "Success", 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onTetheringFailed(int error)
|
|
||||||
{
|
|
||||||
// Hotspot could not be enabled
|
|
||||||
Miscellaneous.logEvent("i", "Tethering start", "Failure. Error code: " + String.valueOf(error), 3);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void disable(Context context)
|
|
||||||
{
|
|
||||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.BAKLAVA)
|
|
||||||
{
|
|
||||||
throw new UnsupportedOperationException("TetheringManager requires Android 16 / API 36");
|
|
||||||
}
|
|
||||||
|
|
||||||
TetheringManager tetheringManager = context.getSystemService(TetheringManager.class);
|
|
||||||
|
|
||||||
TetheringManager.TetheringRequest request = new TetheringManager.TetheringRequest.Builder(TetheringManager.TETHERING_WIFI).build();
|
|
||||||
// tetheringManager.stopTethering(TetheringManager.TETHERING_WIFI, EXECUTOR, new TetheringManager.StopTetheringCallback() {
|
|
||||||
tetheringManager.stopTethering(request, EXECUTOR, new TetheringManager.StopTetheringCallback() {
|
|
||||||
@Override
|
|
||||||
public void onStopTetheringSucceeded()
|
|
||||||
{
|
|
||||||
TetheringManager.StopTetheringCallback.super.onStopTetheringSucceeded();
|
|
||||||
Miscellaneous.logEvent("i", "Tethering stop", "Success", 3);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onStopTetheringFailed(int error)
|
|
||||||
{
|
|
||||||
// Hotspot could not be disabled
|
|
||||||
Miscellaneous.logEvent("i", "Tethering stop", "Failure. Error code: " + String.valueOf(error), 3);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -887,5 +887,5 @@
|
|||||||
<string name="enterAvalue">Geben Sie einen Wert ein.</string>
|
<string name="enterAvalue">Geben Sie einen Wert ein.</string>
|
||||||
<string name="setSystemSettingCapital">Systemeinstellung setzen</string>
|
<string name="setSystemSettingCapital">Systemeinstellung setzen</string>
|
||||||
<string name="examplesWriteSecureSettings">Ich führe keine Liste möglicher Einstellungen. Bitte finden Sie diese Einstellungen selbst. Siehe <a href="https://developer.android.com/reference/android/provider/Settings.Secure">hier</a> für einige (unvollständige) Beispiele.</string>
|
<string name="examplesWriteSecureSettings">Ich führe keine Liste möglicher Einstellungen. Bitte finden Sie diese Einstellungen selbst. Siehe <a href="https://developer.android.com/reference/android/provider/Settings.Secure">hier</a> für einige (unvollständige) Beispiele.</string>
|
||||||
<string name="httpParametersExplanation">Beginnt ein Parametername mit %1$s, während die Methode POST ist, wird er nicht wie die anderen Parameter (mit Schlüssel=Wert) übertragen, sondern als Hauptdaten übertragen. Wenn der Parameter mit 2 % endet, wird keine Codierung durchgeführt.</string>
|
<string name="httpParametersExplanation">Beginnt ein Parametername mit %1$s, während die Methode POST ist, wird er nicht wie die anderen Parameter (mit Schlüssel=Wert) übertragen, sondern als Hauptdaten übertragen. Wenn der Parameter mit %2$s endet, wird keine Codierung durchgeführt.</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -1 +1,2 @@
|
|||||||
* Added: Triggers and actions can now be cloned
|
* Added: Triggers and actions can now be cloned
|
||||||
|
* Fixed: Crash when starting to add/edit a triggerURL action while the app or the system are set to the German language
|
||||||
Reference in New Issue
Block a user