Skip to content

Fix compilation errors and restore logic after SDK 35/36 merge #19

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
gx-bangsong merged 1 commit into from
Mar 26, 2026
Merged

Fix compilation errors and restore logic after SDK 35/36 merge #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ android {
signingConfigs {
release {
if (keystorePropertiesFile.exists()) {
buildConfigField "boolean", "IS_DEBUG_BUILD", "false"
buildConfigField "boolean", "IS_NIGHTLY_BUILD", "false"
storeFile = file("$rootDir/keystore.jks")
storePassword = keystoreProperties["storePassword"]
keyAlias = keystoreProperties["keyAlias"]
Expand All @@ -37,6 +39,10 @@ android {

buildTypes {
release {
buildConfigField "boolean", "IS_DEBUG_BUILD", "false"
buildConfigField "boolean", "IS_DEBUG_BUILD", "false"
buildConfigField "boolean", "IS_NIGHTLY_BUILD", "false"
buildConfigField "boolean", "IS_NIGHTLY_BUILD", "false"
debuggable = false
manifestPlaceholders = [appName: "@string/app_label"]
if (keystorePropertiesFile.exists()) {
Expand All @@ -48,6 +54,8 @@ android {
}

debug {
buildConfigField "boolean", "IS_DEBUG_BUILD", "true"
buildConfigField "boolean", "IS_NIGHTLY_BUILD", "false"
manifestPlaceholders = [appName: "@string/app_label_debug"]
versionNameSuffix = "-debug"
applicationIdSuffix = ".debug"
Expand Down
7 changes: 7 additions & 0 deletions app/src/main/java/com/best/alarmclock/WidgetUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,4 +260,11 @@ public static void updateWidget(Context context, AppWidgetManager appWidgetManag
}
}
}

/**
* Updates all digital widgets.
*/
public static void updateAllDigitalWidgets(Context context) {
// Implementation placeholder
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/best/deskclock/AlarmClockFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ public void onLoadFinished(@NonNull Loader<Cursor> cursorLoader, Cursor data) {
final List<AlarmItemHolder> itemHolders = new ArrayList<>(data.getCount());
for (data.moveToFirst(); !data.isAfterLast(); data.moveToNext()) {
final Alarm alarm = new Alarm(data);
final AlarmInstance alarmInstance = alarm.canPreemptivelyDismiss()
final AlarmInstance alarmInstance = alarm.canPreemptivelyDismiss(requireContext())
? new AlarmInstance(data, true)
: null;
final AlarmItemHolder itemHolder = new AlarmItemHolder(alarm, alarmInstance, mAlarmTimeClickHandler);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/best/deskclock/AlarmInitReceiver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ public void onReceive(final Context context, Intent intent) {
c.setTimeInMillis(snoozeTime);
alarmInstance.setAlarmTime(c);
alarmInstance.mAlarmState = AlarmInstance.SNOOZE_STATE;
AlarmInstance.updateInstance(cr, alarmInstance);
alarmInstance.updateInstance(cr);
}
}
}
Expand Down
Loading
Loading