bagnacauda/Automation
1
0
Fork 0
forked from jens/Automation
Code Issues Pull Requests Projects Releases Wiki Activity

GooglePlayFlavor location engine disabled notice.

Browse Source
This commit is contained in:
Jens
2021-03-16 23:23:42 +01:00
parent 722f9f0e6b
commit 4e51cbe36e
7 changed files with 62 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/jens/automation2/ActivityDisplayLongMessage.java Normal file
View File

@ -0,0 +1,23 @@
package com.jens.automation2;
import android.app.Activity;
import android.os.Bundle;
import android.widget.TextView;
import androidx.annotation.Nullable;
public class ActivityDisplayLongMessage extends Activity
{
TextView tvLongMessage;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_display_long_message);
tvLongMessage = (TextView)findViewById(R.id.tvLongMessage);
tvLongMessage.setText(getIntent().getStringExtra("longMessage"));
}
}

29
app/src/main/java/com/jens/automation2/AutomationService.java
View File

@ -154,7 +154,8 @@ public class AutomationService extends Service implements OnInitListener
{
Miscellaneous.logEvent("w", "AutoStart", "Service is started via boot. Settingsfile not available because storage is not mounted, yet. Waiting for 3 seconds.", 4);
Thread.sleep(3000);
} catch (InterruptedException e)
}
catch (InterruptedException e)
{
e.printStackTrace();
}
@ -169,15 +170,13 @@ public class AutomationService extends Service implements OnInitListener
}
//if still no POIs...
if (//PointOfInterest.getPointOfInterestCollection() == null | PointOfInterest.getPointOfInterestCollection().size() == 0
// &&
Rule.getRuleCollection() == null | Rule.getRuleCollection().size() == 0
)
if (Rule.getRuleCollection() == null | Rule.getRuleCollection().size() == 0)
{
Miscellaneous.logEvent("w", "AutomationService", context.getResources().getString(R.string.serviceWontStart), 1);
Toast.makeText(context, context.getResources().getString(R.string.serviceWontStart), Toast.LENGTH_LONG).show();
return false;
} else
}
else
{
return true;
}
@ -318,6 +317,7 @@ public class AutomationService extends Service implements OnInitListener
checkForTtsEngine();
checkForPermissions();
checkForRestrictedFeatures();
checkForMissingBackgroundLocationPermission();
Actions.context = this;
Actions.autoMationServerRef = this;
@ -390,6 +390,23 @@ public class AutomationService extends Service implements OnInitListener
}
}
protected void checkForMissingBackgroundLocationPermission()
{
// if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
// {
if (BuildConfig.FLAVOR.equalsIgnoreCase("googlePlayFlavor"))
{
if (Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest))
{
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);
Miscellaneous.createDismissableNotification(getResources().getString(R.string.locationEngineDisabledShort), notificationIdRestrictions, pi);
}
}
// }
}
public static void startAutomationService(Context context, boolean startAtBoot)
{
if(!(isMyServiceRunning(context)))