Migrate to Java 17 (00dd2b8a) · Commits · Android-smartphones / Ulogger Android

app/build.gradle

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@ android {
		}

		compileOptions {
		sourceCompatibility JavaVersion.VERSION_11
		targetCompatibility JavaVersion.VERSION_11
		sourceCompatibility JavaVersion.VERSION_17
		targetCompatibility JavaVersion.VERSION_17
		}
		lint {
		disable 'GoogleAppIndexingWarning', 'MissingTranslation', 'NotificationIconCompatibility'

app/src/main/java/net/fabiszewski/ulogger/ExternalCommandReceiver.java

+4 −12

Original line number	Diff line number	Diff line
		@@ -35,18 +35,10 @@ public class ExternalCommandReceiver extends BroadcastReceiver {
		String command = intent.getStringExtra("command");
		if (command != null) {
		switch (command) {
		case START_LOGGER:
		startLoggerService(context);
		break;
		case START_NEW_LOGGER:
		startNewLoggerService(context);
		break;
		case STOP_LOGGER:
		stopLogger(context);
		break;
		case START_UPLOAD:
		uploadData(context);
		break;
		case START_LOGGER -> startLoggerService(context);
		case START_NEW_LOGGER -> startNewLoggerService(context);
		case STOP_LOGGER -> stopLogger(context);
		case START_UPLOAD -> uploadData(context);
		}
		}
		}

app/src/main/java/net/fabiszewski/ulogger/ImageTask.java

+5 −8

Original line number	Diff line number	Diff line
		@@ -161,10 +161,7 @@ class ImageTask implements Runnable {
		Activity getActivity();
		}

		static class ImageTaskResult {
		final Uri savedUri;
		final Bitmap thumbnail;

		record ImageTaskResult(Uri savedUri, Bitmap thumbnail) {
		ImageTaskResult(@NonNull Uri savedUri, @NonNull Bitmap thumbnail) {
		this.savedUri = savedUri;
		this.thumbnail = thumbnail;

app/src/main/java/net/fabiszewski/ulogger/MainFragment.java

+24 −38

Original line number	Diff line number	Diff line
		@@ -49,7 +49,6 @@ import java.util.Date;
		import java.util.Locale;
		import java.util.TimeZone;

		@SuppressWarnings("WeakerAccess")
		public class MainFragment extends Fragment implements PermissionHelper.PermissionRequester {

		private final String TAG = MainFragment.class.getSimpleName();
		@@ -540,17 +539,9 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		private void setLedColor(TextView led, int color) {
		Drawable l = TextViewCompat.getCompoundDrawablesRelative(led)[0];
		switch (color) {
		case LED_RED:
		l.setColorFilter(redFilter);
		break;

		case LED_GREEN:
		l.setColorFilter(greenFilter);
		break;

		case LED_YELLOW:
		l.setColorFilter(yellowFilter);
		break;
		case LED_RED -> l.setColorFilter(redFilter);
		case LED_GREEN -> l.setColorFilter(greenFilter);
		case LED_YELLOW -> l.setColorFilter(yellowFilter);
		}
		l.invalidateSelf();
		}
		@@ -659,14 +650,14 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		}
		MainActivity activity = (MainActivity) getActivity();
		switch (intent.getAction()) {
		case LoggerService.BROADCAST_LOCATION_UPDATED:
		case LoggerService.BROADCAST_LOCATION_UPDATED -> {
		updateLocationLabel(LoggerService.lastUpdateRealtime());
		setLocLed(LED_GREEN);
		if (activity != null && !activity.preferenceLiveSync) {
		updateSyncStatus(DbAccess.countUnsynced(context));
		}
		break;
		case WebSyncService.BROADCAST_SYNC_DONE:
		}
		case WebSyncService.BROADCAST_SYNC_DONE -> {
		final int unsyncedCount = DbAccess.countUnsynced(context);
		updateSyncStatus(unsyncedCount);
		setSyncLed(LED_GREEN);
		@@ -680,8 +671,8 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		if (buttonShare.getVisibility() == View.GONE) {
		buttonShare.setVisibility(View.VISIBLE);
		}
		break;
		case (WebSyncService.BROADCAST_SYNC_FAILED): {
		}
		case (WebSyncService.BROADCAST_SYNC_FAILED) -> {
		updateSyncStatus(DbAccess.countUnsynced(context));
		setSyncLed(LED_RED);
		// set error flag and label
		@@ -692,39 +683,34 @@ public class MainFragment extends Fragment implements PermissionHelper.Permissio
		showToast(getString(R.string.uploading_failed) + "\n" + message);
		isUploading = false;
		}
		break;
		}
		case LoggerService.BROADCAST_LOCATION_STARTED:
		case LoggerService.BROADCAST_LOCATION_STARTED -> {
		switchLogger.setChecked(true);
		showToast(getString(R.string.tracking_started));
		setLocLed(LED_YELLOW);
		break;
		case LoggerService.BROADCAST_LOCATION_STOPPED:
		}
		case LoggerService.BROADCAST_LOCATION_STOPPED -> {
		switchLogger.setChecked(false);
		showToast(getString(R.string.tracking_stopped));
		setLocLed(LED_RED);
		break;
		case LoggerService.BROADCAST_LOCATION_GPS_DISABLED:
		}
		case LoggerService.BROADCAST_LOCATION_GPS_DISABLED ->
		showToast(getString(R.string.gps_disabled_warning));
		break;
		case LoggerService.BROADCAST_LOCATION_NETWORK_DISABLED:
		case LoggerService.BROADCAST_LOCATION_NETWORK_DISABLED ->
		showToast(getString(R.string.net_disabled_warning));
		break;
		case LoggerService.BROADCAST_LOCATION_DISABLED:
		case LoggerService.BROADCAST_LOCATION_DISABLED -> {
		showToast(getString(R.string.location_disabled));
		setLocLed(LED_RED);
		break;
		case LoggerService.BROADCAST_LOCATION_NETWORK_ENABLED:
		}
		case LoggerService.BROADCAST_LOCATION_NETWORK_ENABLED ->
		showToast(getString(R.string.using_network));
		break;
		case LoggerService.BROADCAST_LOCATION_GPS_ENABLED:
		case LoggerService.BROADCAST_LOCATION_GPS_ENABLED ->
		showToast(getString(R.string.using_gps));
		break;
		case LoggerService.BROADCAST_LOCATION_PERMISSION_DENIED:
		case LoggerService.BROADCAST_LOCATION_PERMISSION_DENIED -> {
		showToast(getString(R.string.location_permission_denied));
		setLocLed(LED_RED);
		permissionHelper.requestFineLocationPermission();
		break;
		}
		}
		}
		};

app/src/main/java/net/fabiszewski/ulogger/RestartBroadcastReceiver.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -39,19 +39,18 @@ public class RestartBroadcastReceiver extends BroadcastReceiver {
		if (intent != null && intent.getAction() != null) {
		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
		switch (intent.getAction()) {
		case BOOT_COMPLETED:
		case QUICKBOOT_POWERON:
		case BOOT_COMPLETED, QUICKBOOT_POWERON -> {
		boolean autoStart = prefs.getBoolean(SettingsActivity.KEY_AUTO_START, false);
		if (autoStart) {
		startLoggerService(context);
		}
		break;
		case MY_PACKAGE_REPLACED:
		}
		case MY_PACKAGE_REPLACED -> {
		boolean wasRunning = prefs.getBoolean(SettingsActivity.KEY_LOGGER_RUNNING, false);
		if (wasRunning) {
		startLoggerService(context);
		}
		break;
		}
		}
		}