joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #91 from SecUSo/Android-8-Jobs

Browse source 
Adapted service GeneratorService to be a job.
This commit is contained in:
coderPaddyS 2022-11-05 08:47:40 +01:00 committed by GitHub
commit 9a716004d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/AndroidManifest.xml
View file

@ -73,6 +73,7 @@
<service <service
android:name="org.secuso.privacyfriendlysudoku.controller.GeneratorService" android:name="org.secuso.privacyfriendlysudoku.controller.GeneratorService"
android:enabled="true" android:enabled="true"
android:permission="android.permission.BIND_JOB_SERVICE"
android:exported="false" /> android:exported="false" />
</application> </application>

22
app/src/main/java/org/secuso/privacyfriendlysudoku/controller/GeneratorService.java
View file

@ -18,8 +18,10 @@ package org.secuso.privacyfriendlysudoku.controller;
import android.app.IntentService; import android.app.IntentService;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent; import android.content.Intent;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.core.app.JobIntentService;
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.util.Log; import android.util.Log;
@ -49,7 +51,7 @@ import static org.secuso.privacyfriendlysudoku.controller.NewLevelManager.PRE_SA
* *
* @author Christopher Beckmann * @author Christopher Beckmann
*/ */
public class GeneratorService extends IntentService { public class GeneratorService extends JobIntentService {
private static final String TAG = GeneratorService.class.getSimpleName(); private static final String TAG = GeneratorService.class.getSimpleName();
public static final String ACTION_GENERATE = TAG + " ACTION_GENERATE"; public static final String ACTION_GENERATE = TAG + " ACTION_GENERATE";
@ -64,11 +66,11 @@ public class GeneratorService extends IntentService {
//private Handler mHandler = new Handler(); //private Handler mHandler = new Handler();
public GeneratorService() { //public GeneratorService() {
super("Generator Service"); // super("Generator Service");
} //}
public GeneratorService(String name) { super(name); } //public GeneratorService(String name) { super(name); }
private void buildGenerationList() { private void buildGenerationList() {
@ -120,12 +122,11 @@ public class GeneratorService extends IntentService {
// if we start this service multiple times while we are already generating... // if we start this service multiple times while we are already generating...
// we ignore this call and just keep generating // we ignore this call and just keep generating
buildGenerationList(); buildGenerationList();
// generate from the list // generate from the list
if(generationList.size() > 0) { if(generationList.size() > 0) {
// generate 1 level and wait for it to be done. // generate 1 level and wait for it to be done.
Pair<GameType, GameDifficulty> dataPair = generationList.get(0); Pair<GameType, GameDifficulty> dataPair = generationList.remove(0);
GameType type = dataPair.first; GameType type = dataPair.first;
GameDifficulty diff = dataPair.second; GameDifficulty diff = dataPair.second;
@ -275,8 +276,13 @@ public class GeneratorService extends IntentService {
builder.setSmallIcon(R.drawable.splash_icon); builder.setSmallIcon(R.drawable.splash_icon);
startForeground(50, builder.build()); startForeground(50, builder.build());
} }
static void enqueueWork(Context context, Intent intent) {
enqueueWork(context, GeneratorService.class, 1000, intent);
}
@Override @Override
protected void onHandleIntent(@Nullable Intent intent) { protected void onHandleWork(@Nullable Intent intent) {
if (intent != null) { if (intent != null) {
String action = intent.getAction(); String action = intent.getAction();

3
app/src/main/java/org/secuso/privacyfriendlysudoku/controller/NewLevelManager.java
View file

@ -217,7 +217,8 @@ public class NewLevelManager {
Intent i = new Intent(context, GeneratorService.class); Intent i = new Intent(context, GeneratorService.class);
i.setAction(GeneratorService.ACTION_GENERATE); i.setAction(GeneratorService.ACTION_GENERATE);
//i.putExtra(ProtocolService.EXTRA_PROTOCOL, current.componentName().flattenToString()); //i.putExtra(ProtocolService.EXTRA_PROTOCOL, current.componentName().flattenToString());
context.startService(i); //context.startService(i);
GeneratorService.enqueueWork(context, i);
//new AsyncGenerationTask().execute(); //new AsyncGenerationTask().execute();
} }