Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

services: fix START_STICKY #2401

Merged
merged 6 commits into from
Jan 14, 2022
Merged

services: fix START_STICKY #2401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fa0573e
fix sticky
mzakharo Jan 5, 2021
d08ca91
cleanup
mzakharo Jan 6, 2021
c0f63c6
Merge branch 'develop' into sticky
mzakharo Jan 7, 2021
df54ad8
fix STICKY for foreground services
mzakharo Jan 13, 2021
834f498
Merge branch 'develop' into sticky
mzakharo Jan 13, 2021
95a78f2
Merge branch 'develop' into sticky
mzakharo Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions pythonforandroid/bootstraps/common/build/src/main/java/org/kivy/android/PythonService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,15 @@ public void onCreate() {
public int onStartCommand(Intent intent, int flags, int startId) {
if (pythonThread != null) {
Log.v("python service", "service exists, do not start again");
return START_NOT_STICKY;
return startType();
}
//intent is null if OS restarts a STICKY service
if (intent == null) {
Context context = getApplicationContext();
intent = getThisDefaultIntent(context, "");
}

startIntent = intent;
startIntent = intent;
Bundle extras = intent.getExtras();
androidPrivate = extras.getString("androidPrivate");
androidArgument = extras.getString("androidArgument");
Expand All @@ -91,6 +96,10 @@ protected int getServiceId() {
return 1;
}

protected Intent getThisDefaultIntent(Context ctx, String pythonServiceArgument) {
return null;
}

protected void doStartForeground(Bundle extras) {
String serviceTitle = extras.getString("serviceTitle");
String serviceDescription = extras.getString("serviceDescription");
Expand Down Expand Up @@ -153,7 +162,10 @@ public void onDestroy() {
@Override
public void onTaskRemoved(Intent rootIntent) {
super.onTaskRemoved(rootIntent);
stopSelf();
//sticky servcie runtime/restart is managed by the OS. leave it running when app is closed
if (startType() != START_STICKY) {
stopSelf();
}
}

@Override
Expand Down
12 changes: 11 additions & 1 deletion pythonforandroid/bootstraps/common/build/templates/Service.tmpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@ protected int getServiceId() {
}

static public void start(Context ctx, String pythonServiceArgument) {
Intent intent = getDefaultIntent(ctx, pythonServiceArgument);
ctx.startService(intent);
}

static public Intent getDefaultIntent(Context ctx, String pythonServiceArgument) {
Intent intent = new Intent(ctx, Service{{ name|capitalize }}.class);
String argument = ctx.getFilesDir().getAbsolutePath() + "/app";
intent.putExtra("androidPrivate", ctx.getFilesDir().getAbsolutePath());
Expand All @@ -31,7 +36,12 @@ static public void start(Context ctx, String pythonServiceArgument) {
intent.putExtra("pythonHome", argument);
intent.putExtra("pythonPath", argument + ":" + argument + "/lib");
intent.putExtra("pythonServiceArgument", pythonServiceArgument);
ctx.startService(intent);
return intent;
}

@Override
mzakharo marked this conversation as resolved.
Show resolved Hide resolved
protected Intent getThisDefaultIntent(Context ctx, String pythonServiceArgument) {
return Service{{ name|capitalize }}.getDefaultIntent(ctx, pythonServiceArgument);
}

static public void stop(Context ctx) {
Expand Down