Bug fixes

* Fix native date picker crash
* Didn't bump 6.8 upgrader version after 6.7.3 fix
pull/848/head 6.8.1
Alex Baker 5 years ago
parent fabde0799b
commit 19b04c18ac

@ -1,5 +1,14 @@
Change Log
---
### 6.8.1 (unreleased)
* Fix CalDAV filter migration
* Fix native date picker crash
* Update translations
* Hebrew - @yarons
* Japanese - @naofum
* Portuguese - @jrcacd
### 6.8 (2019-07-30)
* Name your own subscription price! Upgrade, downgrade, or cancel at any time

@ -31,8 +31,8 @@ android {
defaultConfig {
testApplicationId = "org.tasks.test"
applicationId = "org.tasks"
versionCode = 606
versionName = "6.8"
versionCode = 607
versionName = "6.8.1"
targetSdkVersion(Versions.compileSdk)
minSdkVersion(Versions.minSdk)
multiDexEnabled = true

@ -41,7 +41,7 @@ public class Upgrader {
private static final int V6_0_beta_2 = 523;
private static final int V6_4 = 546;
private static final int V6_7 = 585;
private static final int V6_8 = 593;
private static final int V6_8_1 = 607;
private final Preferences preferences;
private final Tracker tracker;
private final TagDataDao tagDataDao;
@ -86,7 +86,7 @@ public class Upgrader {
run(from, V6_0_beta_2, this::migrateGoogleTaskAccount);
run(from, V6_4, this::migrateUris);
run(from, V6_7, this::migrateGoogleTaskFilters);
run(from, V6_8, this::migrateCaldavFilters);
run(from, V6_8_1, this::migrateCaldavFilters);
tracker.reportEvent(Tracking.Events.UPGRADE, Integer.toString(from));
}
preferences.setCurrentVersion(to);

@ -6,10 +6,12 @@ import android.annotation.SuppressLint;
import android.app.Activity;
import android.app.DatePickerDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
import android.os.Bundle;
import android.widget.DatePicker;
import javax.inject.Inject;
import org.tasks.injection.ForActivity;
import org.tasks.injection.InjectingNativeDialogFragment;
import org.tasks.injection.NativeDialogFragmentComponent;
import org.tasks.preferences.Preferences;
@ -22,6 +24,7 @@ public class NativeDatePickerDialog extends InjectingNativeDialogFragment
private static final String EXTRA_YEAR = "extra_year";
private static final String EXTRA_MONTH = "extra_month";
private static final String EXTRA_DAY = "extra_day";
@Inject @ForActivity Context context;
@Inject Theme theme;
@Inject Preferences preferences;
private NativeDatePickerDialogCallback callback;
@ -49,7 +52,7 @@ public class NativeDatePickerDialog extends InjectingNativeDialogFragment
Bundle args = getArguments();
DatePickerDialog datePickerDialog =
new DatePickerDialog(
theme.wrap(getContext()),
theme.wrap(context),
this,
args.getInt(EXTRA_YEAR),
args.getInt(EXTRA_MONTH),

Loading…
Cancel
Save