Skip to content

Add noService optional boolean to Cursor/ContentValues in ServiceUpdate #94

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

Merged
mmathieum merged 3 commits into from
Mar 19, 2026
Merged

Add noService optional boolean to Cursor/ContentValues in ServiceUpdate #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9906516
Initial plan
Copilot Mar 18, 2026
ffcc2d0
Add optional boolean to Cursor/ContentValues for noService in Service…
Copilot Mar 18, 2026
5249d2c
Remove gradle wrapper files accidentally added to PR
Copilot Mar 19, 2026
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
10 changes: 8 additions & 2 deletions src/main/java/org/mtransit/android/commons/data/ServiceUpdate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.mtransit.android.commons.ComparatorUtils;
import org.mtransit.android.commons.CursorExtKt;
import org.mtransit.android.commons.MTLog;
import org.mtransit.android.commons.SqlUtils;
import org.mtransit.android.commons.TimeUtils;
import org.mtransit.android.commons.provider.serviceupdate.ServiceUpdateProviderContract;

Expand Down Expand Up @@ -255,7 +256,8 @@ public static ServiceUpdate fromCursor(@NonNull Cursor cursor) {
final String originalId = CursorExtKt.optString(cursor, ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_ORIGINAL_ID, null);
final String sourceLabel = cursor.getString(cursor.getColumnIndexOrThrow(ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_SOURCE_LABEL));
final String sourceId = cursor.getString(cursor.getColumnIndexOrThrow(ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_SOURCE_ID));
return new ServiceUpdate(id, targetUUID, targetTripId, lastUpdateInMs, maxValidityInMs, text, htmlText, severity, sourceId, sourceLabel, originalId, language);
final Boolean noService = CursorExtKt.optBoolean(cursor, ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_NO_SERVICE, null);
return new ServiceUpdate(id, targetUUID, targetTripId, lastUpdateInMs, maxValidityInMs, text, htmlText, severity, noService, sourceId, sourceLabel, originalId, language);
}

/**
Expand All @@ -275,7 +277,8 @@ public Object[] getCursorRow() {
language,
originalId,
sourceLabel,
sourceId
sourceId,
noService == null ? null : SqlUtils.toSQLBoolean(noService)
};
}

Expand All @@ -296,6 +299,9 @@ public ContentValues toContentValues() {
contentValues.put(ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_ORIGINAL_ID, this.originalId);
contentValues.put(ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_SOURCE_LABEL, this.sourceLabel);
contentValues.put(ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_SOURCE_ID, this.sourceId);
if (this.noService != null) {
contentValues.put(ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_NO_SERVICE, SqlUtils.toSQLBoolean(this.noService));
}
return contentValues;
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/mtransit/android/commons/provider/serviceupdate/ServiceUpdateDbHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ abstract class ServiceUpdateDbHelper(
const val T_SERVICE_UPDATE_K_SOURCE_LABEL = "source_label"
const val T_SERVICE_UPDATE_K_ORIGINAL_ID = "original_id"
const val T_SERVICE_UPDATE_K_SOURCE_ID = "source_id"
const val T_SERVICE_UPDATE_K_NO_SERVICE = "no_service"

@Suppress("unused")
val T_SERVICE_UPDATE_SQL_CREATE = getSqlCreateBuilder(T_SERVICE_UPDATE).build()
Expand All @@ -53,6 +54,7 @@ abstract class ServiceUpdateDbHelper(
.appendColumn(T_SERVICE_UPDATE_K_ORIGINAL_ID, SqlUtils.TXT)
.appendColumn(T_SERVICE_UPDATE_K_SOURCE_LABEL, SqlUtils.TXT)
.appendColumn(T_SERVICE_UPDATE_K_SOURCE_ID, SqlUtils.TXT)
.appendColumn(T_SERVICE_UPDATE_K_NO_SERVICE, SqlUtils.INT)
}

abstract val dbName: String
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/mtransit/android/commons/provider/serviceupdate/ServiceUpdateProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ public static void append(@NonNull UriMatcher uriMatcher, @NonNull String author
.appendTableColumn(ServiceUpdateDbHelper.T_SERVICE_UPDATE, ServiceUpdateDbHelper.T_SERVICE_UPDATE_K_ORIGINAL_ID, Columns.T_SERVICE_UPDATE_K_ORIGINAL_ID)
.appendTableColumn(ServiceUpdateDbHelper.T_SERVICE_UPDATE, ServiceUpdateDbHelper.T_SERVICE_UPDATE_K_SOURCE_LABEL, ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_SOURCE_LABEL) //
.appendTableColumn(ServiceUpdateDbHelper.T_SERVICE_UPDATE, ServiceUpdateDbHelper.T_SERVICE_UPDATE_K_SOURCE_ID, ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_SOURCE_ID) //
.appendTableColumn(ServiceUpdateDbHelper.T_SERVICE_UPDATE, ServiceUpdateDbHelper.T_SERVICE_UPDATE_K_NO_SERVICE, ServiceUpdateProviderContract.Columns.T_SERVICE_UPDATE_K_NO_SERVICE) //
.build();
// @formatter:on

Expand Down
4 changes: 3 additions & 1 deletion ...va/org/mtransit/android/commons/provider/serviceupdate/ServiceUpdateProviderContract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ public interface ServiceUpdateProviderContract extends ProviderContract {
Columns.T_SERVICE_UPDATE_K_LANGUAGE,
Columns.T_SERVICE_UPDATE_K_ORIGINAL_ID,
Columns.T_SERVICE_UPDATE_K_SOURCE_LABEL,
Columns.T_SERVICE_UPDATE_K_SOURCE_ID
Columns.T_SERVICE_UPDATE_K_SOURCE_ID,
Columns.T_SERVICE_UPDATE_K_NO_SERVICE
};

class Columns {
Expand All @@ -91,6 +92,7 @@ class Columns {
public static final String T_SERVICE_UPDATE_K_SOURCE_LABEL = "source_label";
public static final String T_SERVICE_UPDATE_K_ORIGINAL_ID = "original_id";
public static final String T_SERVICE_UPDATE_K_SOURCE_ID = "source_id";
public static final String T_SERVICE_UPDATE_K_NO_SERVICE = "no_service";
}

@SuppressWarnings("WeakerAccess")
Expand Down