Google Task sync requires Android 4.4+

pull/935/head
Alex Baker 4 years ago
parent 041aedf9fb
commit ee74d9f89e

@ -134,6 +134,10 @@ public class AndroidUtilities {
return (int) (dp * displayMetrics.density + 0.5f);
}
public static boolean preKitKat() {
return !atLeastKitKat();
}
public static boolean preLollipop() {
return !atLeastLollipop();
}

@ -1,6 +1,7 @@
package org.tasks.gtasks;
import static com.google.common.collect.Lists.transform;
import static com.todoroo.andlib.utility.AndroidUtilities.preKitKat;
import static org.tasks.date.DateTimeUtils.newDateTime;
import android.content.Context;
@ -165,11 +166,13 @@ public class GoogleTaskSynchronizer {
}
private void synchronize(GoogleTaskAccount account) throws IOException {
if (preKitKat()) {
account.setError(context.getString(R.string.requires_android_version, "4.4"));
return;
}
if (!permissionChecker.canAccessAccounts()
|| googleAccountManager.getAccount(account.getAccount()) == null) {
account.setError(context.getString(R.string.cannot_access_account));
googleTaskListDao.update(account);
localBroadcastManager.broadcastRefreshList();
return;
}

@ -1,5 +1,7 @@
package org.tasks.sync;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
import android.app.Activity;
import android.content.Intent;
import android.content.res.TypedArray;
@ -9,6 +11,7 @@ import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
@ -61,9 +64,18 @@ public class AddAccountDialog {
(dialog, which) -> {
switch (which) {
case 0:
activity.startActivityForResult(
new Intent(activity, GtasksLoginActivity.class),
SynchronizationKt.REQUEST_GOOGLE_TASKS);
if (atLeastKitKat()) {
activity.startActivityForResult(
new Intent(activity, GtasksLoginActivity.class),
SynchronizationKt.REQUEST_GOOGLE_TASKS);
} else {
Toast.makeText(
activity,
activity.getString(R.string.requires_android_version, "4.4"),
Toast.LENGTH_SHORT)
.show();
return;
}
break;
case 1:
activity.startActivityForResult(

@ -557,4 +557,5 @@ File %1$s contained %2$s.\n\n
<string name="upgrade_blurb_3">Choose any subscription price below to start your free trial. You may cancel at any time</string>
<string name="upgrade_blurb_4">Your support means a lot to me, thank you!</string>
<string name="back">Back</string>
<string name="requires_android_version">Requires Android %s+</string>
</resources>

Loading…
Cancel
Save