octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CiaInstallWorker.java: cleanup magic numbers

This commit is contained in:
SachinVin 2023-06-16 22:23:34 +05:30
parent c074460f60
commit 318d55252f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/android/app/src/main/java/org/citra/citra_emu/utils/CiaInstallWorker.java
View File

@ -5,8 +5,6 @@ import android.app.NotificationManager;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Handler;
import android.os.Looper;
import android.widget.Toast; import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
@ -15,14 +13,7 @@ import androidx.work.ForegroundInfo;
import androidx.work.Worker; import androidx.work.Worker;
import androidx.work.WorkerParameters; import androidx.work.WorkerParameters;
import com.google.common.util.concurrent.ListenableFuture;
import org.citra.citra_emu.CitraApplication;
import org.citra.citra_emu.R; import org.citra.citra_emu.R;
import org.citra.citra_emu.ui.main.MainActivity;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class CiaInstallWorker extends Worker { public class CiaInstallWorker extends Worker {
private final Context mContext = getApplicationContext(); private final Context mContext = getApplicationContext();
@ -55,7 +46,9 @@ public class CiaInstallWorker extends Worker {
private static long mLastNotifiedTime = 0; private static long mLastNotifiedTime = 0;
private static int mStatusNotificationId = 0xC1A0001; private static final int SUMMARY_NOTIFICATION_ID = 0xC1A0000;
private static final int PROGRESS_NOTIFICATION_ID = SUMMARY_NOTIFICATION_ID + 1;
private static int mStatusNotificationId = SUMMARY_NOTIFICATION_ID + 2;
public CiaInstallWorker( public CiaInstallWorker(
@NonNull Context context, @NonNull Context context,
@ -113,7 +106,7 @@ public class CiaInstallWorker extends Worker {
} }
// Even if newer versions of Android don't show the group summary text that you design, // Even if newer versions of Android don't show the group summary text that you design,
// you always need to manually set a summary to enable grouped notifications. // you always need to manually set a summary to enable grouped notifications.
mNotificationManager.notify(0xC1A0000, mSummaryNotification); mNotificationManager.notify(SUMMARY_NOTIFICATION_ID, mSummaryNotification);
mNotificationManager.notify(mStatusNotificationId++, mInstallStatusBuilder.build()); mNotificationManager.notify(mStatusNotificationId++, mInstallStatusBuilder.build());
} }
@NonNull @NonNull
@ -139,7 +132,7 @@ public class CiaInstallWorker extends Worker {
InstallStatus res = InstallCIA(file); InstallStatus res = InstallCIA(file);
notifyInstallStatus(filename, res); notifyInstallStatus(filename, res);
} }
mNotificationManager.cancel(0xC1A); mNotificationManager.cancel(PROGRESS_NOTIFICATION_ID);
return Result.success(); return Result.success();
} }
@ -154,13 +147,13 @@ public class CiaInstallWorker extends Worker {
} }
mLastNotifiedTime = currentTime; mLastNotifiedTime = currentTime;
mInstallProgressBuilder.setProgress(max, progress, false); mInstallProgressBuilder.setProgress(max, progress, false);
mNotificationManager.notify(0xC1A, mInstallProgressBuilder.build()); mNotificationManager.notify(PROGRESS_NOTIFICATION_ID, mInstallProgressBuilder.build());
} }
@NonNull @NonNull
@Override @Override
public ForegroundInfo getForegroundInfo() { public ForegroundInfo getForegroundInfo() {
return new ForegroundInfo(0xC1A, mInstallProgressBuilder.build()); return new ForegroundInfo(PROGRESS_NOTIFICATION_ID, mInstallProgressBuilder.build());
} }
private native InstallStatus InstallCIA(String path); private native InstallStatus InstallCIA(String path);