diff --git a/app/src/amazon/java/org/tasks/gtasks/PlayServices.java b/app/src/amazon/java/org/tasks/gtasks/PlayServices.java index 8e2d615dc..1b6da2c10 100644 --- a/app/src/amazon/java/org/tasks/gtasks/PlayServices.java +++ b/app/src/amazon/java/org/tasks/gtasks/PlayServices.java @@ -1,15 +1,10 @@ package org.tasks.gtasks; import android.app.Activity; - -import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential; -import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity; - +import javax.inject.Inject; import org.tasks.drive.DriveLoginActivity; import org.tasks.play.AuthResultHandler; -import javax.inject.Inject; - public class PlayServices { @Inject diff --git a/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java b/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java index 56cd7d056..98b3439b2 100644 --- a/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java +++ b/app/src/androidTest/java/com/todoroo/andlib/test/TranslationTests.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.test; import static androidx.test.InstrumentationRegistry.getTargetContext; diff --git a/app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java b/app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java index fbef06980..932d6021e 100644 --- a/app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java +++ b/app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.utility; import static androidx.test.InstrumentationRegistry.getTargetContext; @@ -19,8 +20,8 @@ import static org.tasks.date.DateTimeUtils.newDate; import static org.tasks.date.DateTimeUtils.newDateTime; import android.content.res.Configuration; -import androidx.test.runner.AndroidJUnit4; import android.util.DisplayMetrics; +import androidx.test.runner.AndroidJUnit4; import java.util.Locale; import org.junit.After; import org.junit.Before; diff --git a/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java index bdaac66eb..284f184c3 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java +++ b/app/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.dao; import static junit.framework.Assert.assertEquals; diff --git a/app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java b/app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java index 735329a9a..65e75aa02 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java +++ b/app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.java @@ -1,29 +1,5 @@ package com.todoroo.astrid.reminders; -import com.todoroo.astrid.dao.TaskDao; -import com.todoroo.astrid.data.Task; - -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.InOrder; -import org.tasks.R; -import org.tasks.Snippet; -import org.tasks.injection.InjectingTestCase; -import org.tasks.injection.TestComponent; -import org.tasks.jobs.NotificationQueue; -import org.tasks.jobs.ReminderEntry; -import org.tasks.jobs.WorkManager; -import org.tasks.preferences.Preferences; -import org.tasks.reminders.Random; -import org.tasks.time.DateTime; - -import java.util.concurrent.TimeUnit; - -import javax.inject.Inject; - -import androidx.test.runner.AndroidJUnit4; - import static com.natpryce.makeiteasy.MakeItEasy.with; import static com.todoroo.andlib.utility.DateUtilities.ONE_HOUR; import static com.todoroo.andlib.utility.DateUtilities.ONE_WEEK; @@ -48,6 +24,26 @@ import static org.tasks.makers.TaskMaker.REMINDER_LAST; import static org.tasks.makers.TaskMaker.SNOOZE_TIME; import static org.tasks.makers.TaskMaker.newTask; +import androidx.test.runner.AndroidJUnit4; +import com.todoroo.astrid.dao.TaskDao; +import com.todoroo.astrid.data.Task; +import java.util.concurrent.TimeUnit; +import javax.inject.Inject; +import org.junit.After; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InOrder; +import org.tasks.R; +import org.tasks.Snippet; +import org.tasks.injection.InjectingTestCase; +import org.tasks.injection.TestComponent; +import org.tasks.jobs.NotificationQueue; +import org.tasks.jobs.ReminderEntry; +import org.tasks.jobs.WorkManager; +import org.tasks.preferences.Preferences; +import org.tasks.reminders.Random; +import org.tasks.time.DateTime; + @RunWith(AndroidJUnit4.class) public class ReminderServiceTest extends InjectingTestCase { diff --git a/app/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java b/app/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java index 57d49ff40..ae67a4a21 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java +++ b/app/src/androidTest/java/com/todoroo/astrid/repeats/AdvancedRepeatTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.repeats; import static junit.framework.Assert.assertEquals; diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java b/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java index e59c59faa..665d0c08b 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java +++ b/app/src/androidTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.service; import static junit.framework.Assert.assertEquals; diff --git a/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java b/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java index 6a45715ae..5b9508686 100644 --- a/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java +++ b/app/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.service; import static junit.framework.Assert.assertEquals; diff --git a/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java b/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java index 683ec70ea..9451e699f 100644 --- a/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java +++ b/app/src/androidTest/java/org/tasks/caldav/SynologyTests.java @@ -1,17 +1,15 @@ package org.tasks.caldav; +import static junit.framework.Assert.assertTrue; +import static org.tasks.TestUtilities.vtodo; + +import androidx.test.runner.AndroidJUnit4; +import java.util.TimeZone; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import java.util.TimeZone; - -import androidx.test.runner.AndroidJUnit4; - -import static junit.framework.Assert.assertTrue; -import static org.tasks.TestUtilities.vtodo; - @RunWith(AndroidJUnit4.class) public class SynologyTests { diff --git a/app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java b/app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java index 2c58f3d69..2b9ed654b 100644 --- a/app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java +++ b/app/src/androidTest/java/org/tasks/injection/InjectingTestCase.java @@ -1,12 +1,11 @@ package org.tasks.injection; -import org.junit.Before; - -import timber.log.Timber; - import static androidx.test.InstrumentationRegistry.getTargetContext; import static org.tasks.TestUtilities.initializeMockito; +import org.junit.Before; +import timber.log.Timber; + public abstract class InjectingTestCase { @Before diff --git a/app/src/androidTest/java/org/tasks/injection/TestModule.java b/app/src/androidTest/java/org/tasks/injection/TestModule.java index a692f302a..a0348a131 100644 --- a/app/src/androidTest/java/org/tasks/injection/TestModule.java +++ b/app/src/androidTest/java/org/tasks/injection/TestModule.java @@ -1,7 +1,7 @@ package org.tasks.injection; -import androidx.room.Room; import android.content.Context; +import androidx.room.Room; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.TaskDao; import dagger.Module; diff --git a/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java b/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java index 78347a5f0..84286124c 100644 --- a/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java +++ b/app/src/androidTest/java/org/tasks/jobs/BackupServiceTests.java @@ -3,14 +3,14 @@ * *
See the file "LICENSE" for the full license governing this code. */ -package org.tasks.jobs; -import android.net.Uri; +package org.tasks.jobs; import static androidx.test.InstrumentationRegistry.getTargetContext; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertTrue; +import android.net.Uri; import androidx.test.runner.AndroidJUnit4; import com.todoroo.astrid.dao.TaskDao; import com.todoroo.astrid.data.Task; diff --git a/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java b/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java index bfb27ec19..8cc114e19 100644 --- a/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java +++ b/app/src/androidTest/java/org/tasks/preferences/PreferenceTests.java @@ -1,20 +1,17 @@ package org.tasks.preferences; -import android.annotation.SuppressLint; +import static androidx.test.InstrumentationRegistry.getTargetContext; +import static junit.framework.Assert.assertEquals; +import android.annotation.SuppressLint; +import androidx.test.runner.AndroidJUnit4; +import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.R; import org.tasks.time.DateTime; -import java.util.concurrent.TimeUnit; - -import androidx.test.runner.AndroidJUnit4; - -import static androidx.test.InstrumentationRegistry.getTargetContext; -import static junit.framework.Assert.assertEquals; - @RunWith(AndroidJUnit4.class) public class PreferenceTests { diff --git a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java index 6b2309696..24afbe9d2 100644 --- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java +++ b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.gtasks; import static junit.framework.Assert.assertNotNull; diff --git a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java index 0d0badcef..233170765 100644 --- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java +++ b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksListServiceTest.java @@ -1,9 +1,23 @@ package com.todoroo.astrid.gtasks; +import static com.natpryce.makeiteasy.MakeItEasy.with; +import static java.util.Arrays.asList; +import static java.util.Collections.singletonList; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNull; +import static org.tasks.makers.GtaskListMaker.ID; +import static org.tasks.makers.GtaskListMaker.LAST_SYNC; +import static org.tasks.makers.GtaskListMaker.NAME; +import static org.tasks.makers.GtaskListMaker.REMOTE_ID; +import static org.tasks.makers.GtaskListMaker.newGtaskList; +import static org.tasks.makers.RemoteGtaskListMaker.newRemoteList; +import static org.tasks.time.DateTimeUtils.currentTimeMillis; + +import androidx.test.runner.AndroidJUnit4; import com.google.api.client.util.DateTime; import com.google.api.services.tasks.model.TaskList; import com.todoroo.astrid.service.TaskDeleter; - +import javax.inject.Inject; import org.junit.Test; import org.junit.runner.RunWith; import org.tasks.LocalBroadcastManager; @@ -15,23 +29,6 @@ import org.tasks.injection.TestComponent; import org.tasks.jobs.WorkManager; import org.tasks.makers.RemoteGtaskListMaker; -import javax.inject.Inject; - -import androidx.test.runner.AndroidJUnit4; - -import static com.natpryce.makeiteasy.MakeItEasy.with; -import static java.util.Arrays.asList; -import static java.util.Collections.singletonList; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNull; -import static org.tasks.makers.GtaskListMaker.ID; -import static org.tasks.makers.GtaskListMaker.LAST_SYNC; -import static org.tasks.makers.GtaskListMaker.NAME; -import static org.tasks.makers.GtaskListMaker.REMOTE_ID; -import static org.tasks.makers.GtaskListMaker.newGtaskList; -import static org.tasks.makers.RemoteGtaskListMaker.newRemoteList; -import static org.tasks.time.DateTimeUtils.currentTimeMillis; - @RunWith(AndroidJUnit4.class) public class GtasksListServiceTest extends InjectingTestCase { @@ -47,8 +44,7 @@ public class GtasksListServiceTest extends InjectingTestCase { super.setUp(); workManager.init(); gtasksListService = - new GtasksListService( - googleTaskListDao, taskDeleter, localBroadcastManager); + new GtasksListService(googleTaskListDao, taskDeleter, localBroadcastManager); } @Override diff --git a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java index b638d07c5..f6887e1c1 100644 --- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java +++ b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksMetadataServiceTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.gtasks; import static junit.framework.Assert.assertNotNull; diff --git a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java index 7caeb1a3d..afd64555e 100644 --- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java +++ b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.gtasks; import static junit.framework.Assert.assertEquals; diff --git a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java index f2cb747ef..7ee805fa0 100644 --- a/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java +++ b/app/src/androidTestGoogleplay/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.astrid.gtasks; import static junit.framework.Assert.assertEquals; diff --git a/app/src/generic/java/org/tasks/gtasks/PlayServices.java b/app/src/generic/java/org/tasks/gtasks/PlayServices.java index 3a8b1405c..e6c3f21a2 100644 --- a/app/src/generic/java/org/tasks/gtasks/PlayServices.java +++ b/app/src/generic/java/org/tasks/gtasks/PlayServices.java @@ -1,14 +1,11 @@ package org.tasks.gtasks; import android.app.Activity; - import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity; - +import javax.inject.Inject; import org.tasks.drive.DriveLoginActivity; import org.tasks.play.AuthResultHandler; -import javax.inject.Inject; - public class PlayServices { @Inject diff --git a/app/src/googleplay/java/org/tasks/gtasks/PlayServices.java b/app/src/googleplay/java/org/tasks/gtasks/PlayServices.java index 4cae4cbaf..8ae94ca2b 100644 --- a/app/src/googleplay/java/org/tasks/gtasks/PlayServices.java +++ b/app/src/googleplay/java/org/tasks/gtasks/PlayServices.java @@ -4,7 +4,6 @@ import android.accounts.Account; import android.app.Activity; import android.content.Context; import android.widget.Toast; - import com.google.android.gms.auth.GoogleAuthException; import com.google.android.gms.auth.GoogleAuthUtil; import com.google.android.gms.auth.UserRecoverableAuthException; @@ -13,16 +12,12 @@ import com.google.android.gms.common.GoogleApiAvailability; import com.google.api.services.drive.DriveScopes; import com.google.api.services.tasks.TasksScopes; import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity; - +import java.io.IOException; +import javax.inject.Inject; import org.tasks.R; import org.tasks.injection.ForApplication; import org.tasks.play.AuthResultHandler; import org.tasks.preferences.Preferences; - -import java.io.IOException; - -import javax.inject.Inject; - import timber.log.Timber; public class PlayServices { @@ -92,26 +87,27 @@ public class PlayServices { getToken(DriveScopes.DRIVE_FILE, activity, accountName, handler); } - private void getToken(String scope, Activity activity, String accountName, AuthResultHandler handler) { + private void getToken( + String scope, Activity activity, String accountName, AuthResultHandler handler) { final Account account = accountManager.getAccount(accountName); if (account == null) { handler.authenticationFailed( activity.getString(R.string.gtasks_error_accountNotFound, accountName)); } else { new Thread( - () -> { - try { - GoogleAuthUtil.getToken(activity, account, "oauth2:" + scope, null); - handler.authenticationSuccessful(accountName); - } catch (UserRecoverableAuthException e) { - Timber.e(e); - activity.startActivityForResult( - e.getIntent(), GtasksLoginActivity.RC_REQUEST_OAUTH); - } catch (GoogleAuthException | IOException e) { - Timber.e(e); - handler.authenticationFailed(activity.getString(R.string.gtasks_GLA_errorIOAuth)); - } - }) + () -> { + try { + GoogleAuthUtil.getToken(activity, account, "oauth2:" + scope, null); + handler.authenticationSuccessful(accountName); + } catch (UserRecoverableAuthException e) { + Timber.e(e); + activity.startActivityForResult( + e.getIntent(), GtasksLoginActivity.RC_REQUEST_OAUTH); + } catch (GoogleAuthException | IOException e) { + Timber.e(e); + handler.authenticationFailed(activity.getString(R.string.gtasks_GLA_errorIOAuth)); + } + }) .start(); } } diff --git a/app/src/main/java/com/mdimension/jchronic/AstridChronic.java b/app/src/main/java/com/mdimension/jchronic/AstridChronic.java index 65ae3d4a0..432946849 100644 --- a/app/src/main/java/com/mdimension/jchronic/AstridChronic.java +++ b/app/src/main/java/com/mdimension/jchronic/AstridChronic.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.mdimension.jchronic; import com.mdimension.jchronic.handlers.Handler; diff --git a/app/src/main/java/com/todoroo/andlib/data/Property.java b/app/src/main/java/com/todoroo/andlib/data/Property.java index 999385266..9feba1ad2 100644 --- a/app/src/main/java/com/todoroo/andlib/data/Property.java +++ b/app/src/main/java/com/todoroo/andlib/data/Property.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.data; import android.text.TextUtils; diff --git a/app/src/main/java/com/todoroo/andlib/data/Table.java b/app/src/main/java/com/todoroo/andlib/data/Table.java index e85ffed6c..904aa9f57 100644 --- a/app/src/main/java/com/todoroo/andlib/data/Table.java +++ b/app/src/main/java/com/todoroo/andlib/data/Table.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.data; import com.todoroo.andlib.sql.SqlTable; diff --git a/app/src/main/java/com/todoroo/andlib/sql/Criterion.java b/app/src/main/java/com/todoroo/andlib/sql/Criterion.java index 2a0423ae3..f48aef789 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/Criterion.java +++ b/app/src/main/java/com/todoroo/andlib/sql/Criterion.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.AND; diff --git a/app/src/main/java/com/todoroo/andlib/sql/DBObject.java b/app/src/main/java/com/todoroo/andlib/sql/DBObject.java index f40fa8423..ff707c796 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/DBObject.java +++ b/app/src/main/java/com/todoroo/andlib/sql/DBObject.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.AS; diff --git a/app/src/main/java/com/todoroo/andlib/sql/Field.java b/app/src/main/java/com/todoroo/andlib/sql/Field.java index e5ecce03e..d85852ef0 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/Field.java +++ b/app/src/main/java/com/todoroo/andlib/sql/Field.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.COMMA; diff --git a/app/src/main/java/com/todoroo/andlib/sql/Functions.java b/app/src/main/java/com/todoroo/andlib/sql/Functions.java index 77da6a46f..dd657471b 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/Functions.java +++ b/app/src/main/java/com/todoroo/andlib/sql/Functions.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; public final class Functions { diff --git a/app/src/main/java/com/todoroo/andlib/sql/Join.java b/app/src/main/java/com/todoroo/andlib/sql/Join.java index 59929e6a6..377a0bdb3 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/Join.java +++ b/app/src/main/java/com/todoroo/andlib/sql/Join.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.AND; diff --git a/app/src/main/java/com/todoroo/andlib/sql/JoinType.java b/app/src/main/java/com/todoroo/andlib/sql/JoinType.java index 14078d16b..1b1d58aee 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/JoinType.java +++ b/app/src/main/java/com/todoroo/andlib/sql/JoinType.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; public enum JoinType { diff --git a/app/src/main/java/com/todoroo/andlib/sql/Operator.java b/app/src/main/java/com/todoroo/andlib/sql/Operator.java index 1af320c16..1f46a81f0 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/Operator.java +++ b/app/src/main/java/com/todoroo/andlib/sql/Operator.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; public final class Operator { diff --git a/app/src/main/java/com/todoroo/andlib/sql/Order.java b/app/src/main/java/com/todoroo/andlib/sql/Order.java index 14f0ecd02..3db5de524 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/Order.java +++ b/app/src/main/java/com/todoroo/andlib/sql/Order.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.SPACE; diff --git a/app/src/main/java/com/todoroo/andlib/sql/OrderType.java b/app/src/main/java/com/todoroo/andlib/sql/OrderType.java index 8ede3e3cb..bb10eee72 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/OrderType.java +++ b/app/src/main/java/com/todoroo/andlib/sql/OrderType.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; public enum OrderType { diff --git a/app/src/main/java/com/todoroo/andlib/sql/Query.java b/app/src/main/java/com/todoroo/andlib/sql/Query.java index 356676609..e712dd536 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/Query.java +++ b/app/src/main/java/com/todoroo/andlib/sql/Query.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.ALL; diff --git a/app/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java b/app/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java index 97c625c85..9c47312b6 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java +++ b/app/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; import static com.todoroo.andlib.sql.SqlConstants.COMMA; diff --git a/app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java b/app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java index f232f6da3..61b2319dc 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java +++ b/app/src/main/java/com/todoroo/andlib/sql/SqlConstants.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code. */ + package com.todoroo.andlib.sql; final class SqlConstants { diff --git a/app/src/main/java/com/todoroo/andlib/sql/SqlTable.java b/app/src/main/java/com/todoroo/andlib/sql/SqlTable.java index 86f6b95e5..a579bf53a 100644 --- a/app/src/main/java/com/todoroo/andlib/sql/SqlTable.java +++ b/app/src/main/java/com/todoroo/andlib/sql/SqlTable.java @@ -3,6 +3,7 @@ * *
See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.andlib.sql;
public class SqlTable extends DBObject See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.andlib.sql;
import static com.todoroo.andlib.sql.SqlConstants.SPACE;
diff --git a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
index 1d3c6eddd..1a97e9d80 100644
--- a/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/app/src/main/java/com/todoroo/andlib/utility/AndroidUtilities.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.andlib.utility;
import android.app.Activity;
@@ -15,11 +16,9 @@ import android.util.DisplayMetrics;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.TextView;
-
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-
import timber.log.Timber;
/**
diff --git a/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
index fc9a669ed..80f76f100 100644
--- a/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
+++ b/app/src/main/java/com/todoroo/andlib/utility/DateUtilities.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.andlib.utility;
import static org.tasks.date.DateTimeUtils.newDateTime;
@@ -196,8 +197,7 @@ public class DateUtilities {
return context.getString(abbreviated ? R.string.yest : R.string.yesterday);
}
- if (today + abbreviationLimit >= input
- && today - abbreviationLimit <= input) {
+ if (today + abbreviationLimit >= input && today - abbreviationLimit <= input) {
return abbreviated
? DateUtilities.getWeekdayShort(newDateTime(date))
: DateUtilities.getWeekday(newDateTime(date));
diff --git a/app/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java b/app/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java
index 28f334be4..bff2b7c27 100644
--- a/app/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java
+++ b/app/src/main/java/com/todoroo/andlib/utility/DialogUtilities.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.andlib.utility;
import android.app.Activity;
diff --git a/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
index b19af24bc..82dfa41aa 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java
@@ -3,17 +3,18 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.activity;
import static java.util.Arrays.asList;
import android.content.Context;
import android.os.Bundle;
+import android.view.MenuItem;
+import androidx.appcompat.widget.Toolbar;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
-import android.view.MenuItem;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.google.common.base.Strings;
@@ -90,7 +91,8 @@ public class BeastModePreferences extends ThemedInjectingAppCompatActivity
setContentView(R.layout.beast_mode_pref_activity);
ButterKnife.bind(this);
- toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px));
+ toolbar.setNavigationIcon(
+ ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px));
toolbar.setNavigationOnClickListener(v -> finish());
toolbar.inflateMenu(R.menu.beast_mode);
toolbar.setOnMenuItemClickListener(this);
diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
index 1a1070a46..eab0a2032 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivity.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.activity;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
@@ -11,18 +12,18 @@ import static org.tasks.tasklist.ActionUtils.applySupportActionModeColor;
import static org.tasks.ui.NavigationDrawerFragment.OnFilterItemClickedListener;
import android.annotation.SuppressLint;
-import androidx.lifecycle.ViewModelProviders;
import android.content.Intent;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.fragment.app.FragmentManager;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.view.ActionMode;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.appcompat.view.ActionMode;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.FragmentManager;
+import androidx.lifecycle.ViewModelProviders;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.todoroo.astrid.api.CaldavFilter;
diff --git a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java
index ae08d141b..62ba4ee2a 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java
@@ -1,26 +1,21 @@
package com.todoroo.astrid.activity;
+import static com.google.common.collect.Lists.newArrayList;
+import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow;
+import static org.tasks.intents.TaskIntents.getEditTaskStack;
+
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.service.TaskCreator;
-
+import java.util.ArrayList;
+import javax.inject.Inject;
import org.tasks.data.TaskAttachment;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity;
-
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
import timber.log.Timber;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow;
-import static org.tasks.intents.TaskIntents.getEditTaskStack;
-
/**
* @author joshuagross
* Create a new task based on incoming links from the "share" menu
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
index 1cf59a1f1..96298f14f 100755
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java
@@ -3,8 +3,12 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.activity;
+import static org.tasks.date.DateTimeUtils.newDateTime;
+import static org.tasks.files.FileHelper.copyToUri;
+
import android.app.Activity;
import android.content.Context;
import android.net.Uri;
@@ -15,7 +19,12 @@ import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
-
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import butterknife.BindView;
+import butterknife.ButterKnife;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.dao.TaskDao;
@@ -26,7 +35,8 @@ import com.todoroo.astrid.service.TaskDeleter;
import com.todoroo.astrid.timers.TimerPlugin;
import com.todoroo.astrid.ui.EditTitleControlSet;
import com.todoroo.astrid.utility.Flags;
-
+import java.util.List;
+import javax.inject.Inject;
import org.tasks.LocalBroadcastManager;
import org.tasks.R;
import org.tasks.analytics.Tracker;
@@ -42,20 +52,6 @@ import org.tasks.preferences.Preferences;
import org.tasks.ui.MenuColorizer;
import org.tasks.ui.TaskEditControlFragment;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-
-import static org.tasks.date.DateTimeUtils.newDateTime;
-import static org.tasks.files.FileHelper.copyToUri;
-
public final class TaskEditFragment extends InjectingFragment
implements Toolbar.OnMenuItemClickListener {
@@ -118,7 +114,10 @@ public final class TaskEditFragment extends InjectingFragment
final boolean backButtonSavesTask = preferences.backButtonSavesTask();
toolbar.setNavigationIcon(
ContextCompat.getDrawable(
- context, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
+ context,
+ backButtonSavesTask
+ ? R.drawable.ic_outline_clear_24px
+ : R.drawable.ic_outline_save_24px));
toolbar.setNavigationOnClickListener(
v -> {
if (backButtonSavesTask) {
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index 902a4160a..fe769a8e8 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -3,36 +3,37 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.activity;
import static android.app.Activity.RESULT_OK;
import static androidx.core.content.ContextCompat.getColor;
import android.app.Activity;
-import androidx.lifecycle.ViewModelProviders;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.speech.RecognizerIntent;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import com.google.android.material.snackbar.Snackbar;
import androidx.core.view.MenuItemCompat;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.lifecycle.ViewModelProviders;
import androidx.recyclerview.widget.DefaultItemAnimator;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
+import com.google.android.material.snackbar.Snackbar;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.QueryTemplate;
@@ -49,8 +50,8 @@ import com.todoroo.astrid.service.TaskMover;
import com.todoroo.astrid.timers.TimerPlugin;
import io.reactivex.disposables.Disposable;
import io.reactivex.subjects.PublishSubject;
-import java.util.concurrent.TimeUnit;
import java.util.List;
+import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import org.tasks.LocalBroadcastManager;
import org.tasks.R;
@@ -132,7 +133,7 @@ public class TaskListFragment extends InjectingFragment
private PublishSubject See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.adapter;
import static androidx.core.content.ContextCompat.getColor;
@@ -17,11 +18,6 @@ import android.content.Intent;
import android.content.res.ColorStateList;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
-import androidx.core.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -29,6 +25,11 @@ import android.widget.ArrayAdapter;
import android.widget.CheckedTextView;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.core.util.Pair;
import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.FilterListItem;
import com.todoroo.astrid.core.CustomFilterActivity;
@@ -151,7 +152,8 @@ public class FilterAdapter extends ArrayAdapter See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.adapter;
import static com.google.common.collect.Lists.newArrayList;
diff --git a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java
index c50a05f71..71e63f7b5 100644
--- a/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java
+++ b/app/src/main/java/com/todoroo/astrid/alarms/AlarmService.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.alarms;
import java.util.LinkedHashSet;
diff --git a/app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java b/app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
index d3210970e..cfb20f8f6 100644
--- a/app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
+++ b/app/src/main/java/com/todoroo/astrid/api/AstridApiConstants.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.api;
/**
diff --git a/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java b/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java
index 8c8341719..2d0f624a0 100644
--- a/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java
+++ b/app/src/main/java/com/todoroo/astrid/api/CustomFilterCriterion.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.api;
import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/todoroo/astrid/api/Filter.java b/app/src/main/java/com/todoroo/astrid/api/Filter.java
index 158d3ecc1..0a28682f2 100644
--- a/app/src/main/java/com/todoroo/astrid/api/Filter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/Filter.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.api;
import android.os.Parcel;
diff --git a/app/src/main/java/com/todoroo/astrid/api/FilterListItem.java b/app/src/main/java/com/todoroo/astrid/api/FilterListItem.java
index 447e3fec2..aac1def73 100644
--- a/app/src/main/java/com/todoroo/astrid/api/FilterListItem.java
+++ b/app/src/main/java/com/todoroo/astrid/api/FilterListItem.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.api;
import android.content.Intent;
diff --git a/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java b/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java
index ad3dd1d2a..c8874b240 100644
--- a/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java
+++ b/app/src/main/java/com/todoroo/astrid/api/MultipleSelectCriterion.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.api;
import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/todoroo/astrid/api/PermaSql.java b/app/src/main/java/com/todoroo/astrid/api/PermaSql.java
index a19760e60..15923c864 100644
--- a/app/src/main/java/com/todoroo/astrid/api/PermaSql.java
+++ b/app/src/main/java/com/todoroo/astrid/api/PermaSql.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.api;
import static org.tasks.date.DateTimeUtils.newDateTime;
diff --git a/app/src/main/java/com/todoroo/astrid/api/SearchFilter.java b/app/src/main/java/com/todoroo/astrid/api/SearchFilter.java
index ae2d4c62a..816dd86cf 100644
--- a/app/src/main/java/com/todoroo/astrid/api/SearchFilter.java
+++ b/app/src/main/java/com/todoroo/astrid/api/SearchFilter.java
@@ -2,7 +2,6 @@ package com.todoroo.astrid.api;
import android.os.Parcel;
import android.os.Parcelable;
-
import com.todoroo.andlib.sql.QueryTemplate;
public class SearchFilter extends Filter {
diff --git a/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java b/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java
index 1347e65ff..b0583cbc3 100644
--- a/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java
+++ b/app/src/main/java/com/todoroo/astrid/api/TextInputCriterion.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.api;
import android.graphics.Bitmap;
diff --git a/app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java b/app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java
index 19e7dcbe8..15fba5f1c 100755
--- a/app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java
+++ b/app/src/main/java/com/todoroo/astrid/backup/BackupConstants.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.backup;
/**
diff --git a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java
index b90d5efbe..9886df8a9 100755
--- a/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java
+++ b/app/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.backup;
import android.app.Activity;
@@ -11,11 +12,13 @@ import android.content.res.Resources;
import android.net.Uri;
import android.os.Handler;
import android.text.TextUtils;
-
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
-
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import javax.inject.Inject;
import org.tasks.LocalBroadcastManager;
import org.tasks.R;
import org.tasks.backup.XmlReader;
@@ -35,13 +38,6 @@ import org.tasks.dialogs.DialogBuilder;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import javax.inject.Inject;
-
import timber.log.Timber;
public class TasksXmlImporter {
diff --git a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
index 21c2a8059..70a61eae5 100644
--- a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.core;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
index 16fffe82c..c12d04f35 100644
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.core;
import static android.text.TextUtils.isEmpty;
@@ -12,8 +13,6 @@ import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.os.Bundle;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.MenuItem;
@@ -21,6 +20,8 @@ import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.ListView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.todoroo.andlib.data.Property.CountProperty;
diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
index ee0602aee..2e2330950 100644
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java
@@ -3,10 +3,10 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.core;
import android.content.DialogInterface;
-import androidx.annotation.NonNull;
import android.view.ContextMenu;
import android.view.LayoutInflater;
import android.view.MenuItem;
@@ -17,6 +17,7 @@ import android.widget.EditText;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.NonNull;
import com.todoroo.astrid.api.MultipleSelectCriterion;
import com.todoroo.astrid.api.TextInputCriterion;
import com.todoroo.astrid.core.CustomFilterActivity.CriterionInstance;
diff --git a/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
index 058aa9ebd..5ea5eacd9 100644
--- a/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.core;
import static com.google.common.collect.Lists.newArrayList;
diff --git a/app/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java b/app/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java
index 0a72a84bd..8fcbee0e7 100644
--- a/app/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java
+++ b/app/src/main/java/com/todoroo/astrid/core/DefaultsPreferences.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.core;
import static org.tasks.PermissionUtil.verifyPermissions;
diff --git a/app/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java b/app/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java
index a57df6f73..340d8df97 100644
--- a/app/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java
+++ b/app/src/main/java/com/todoroo/astrid/core/OldTaskPreferences.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.core;
import android.os.Bundle;
diff --git a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java
index 417caf56a..9584c4834 100644
--- a/app/src/main/java/com/todoroo/astrid/core/SortHelper.java
+++ b/app/src/main/java/com/todoroo/astrid/core/SortHelper.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.core;
import static com.todoroo.astrid.dao.TaskDao.TaskCriteria.isVisible;
@@ -22,16 +23,14 @@ import org.tasks.preferences.Preferences;
*/
public class SortHelper {
- private static final String ADJUSTED_DUE_DATE =
- "(CASE WHEN (dueDate / 1000) % 60 > 0 THEN dueDate ELSE (dueDate + 43140000) END)";
-
public static final int SORT_AUTO = 0;
public static final int SORT_ALPHA = 1;
public static final int SORT_DUE = 2;
public static final int SORT_IMPORTANCE = 3;
public static final int SORT_MODIFIED = 4;
public static final int SORT_WIDGET = 5;
-
+ private static final String ADJUSTED_DUE_DATE =
+ "(CASE WHEN (dueDate / 1000) % 60 > 0 THEN dueDate ELSE (dueDate + 43140000) END)";
private static final Order ORDER_TITLE = Order.asc(Functions.upper(Task.TITLE));
/** Takes a SQL query, and if there isn't already an order, creates an order. */
@@ -79,7 +78,9 @@ public class SortHelper {
case SORT_DUE:
order =
Order.asc(
- "(CASE WHEN (dueDate=0) THEN (strftime('%s','now')*1000)*2 ELSE " + ADJUSTED_DUE_DATE + " END)+importance");
+ "(CASE WHEN (dueDate=0) THEN (strftime('%s','now')*1000)*2 ELSE "
+ + ADJUSTED_DUE_DATE
+ + " END)+importance");
break;
case SORT_IMPORTANCE:
order =
diff --git a/app/src/main/java/com/todoroo/astrid/dao/Database.java b/app/src/main/java/com/todoroo/astrid/dao/Database.java
index 001d0f9d9..870a55005 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/Database.java
+++ b/app/src/main/java/com/todoroo/astrid/dao/Database.java
@@ -3,11 +3,12 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.dao;
-import androidx.sqlite.db.SupportSQLiteDatabase;
-import androidx.room.RoomDatabase;
import android.database.Cursor;
+import androidx.room.RoomDatabase;
+import androidx.sqlite.db.SupportSQLiteDatabase;
import com.todoroo.astrid.data.Task;
import java.io.IOException;
import org.tasks.analytics.Tracker;
diff --git a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
index a507c66d1..a1d95df2a 100644
--- a/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
+++ b/app/src/main/java/com/todoroo/astrid/dao/TaskDao.java
@@ -3,10 +3,15 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.dao;
-import android.database.Cursor;
+import static com.todoroo.andlib.utility.DateUtilities.now;
+import android.database.Cursor;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.Update;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.sql.Criterion;
import com.todoroo.andlib.sql.Functions;
@@ -15,20 +20,12 @@ import com.todoroo.astrid.api.Filter;
import com.todoroo.astrid.api.PermaSql;
import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.helper.UUIDHelper;
-
-import org.tasks.BuildConfig;
-import org.tasks.jobs.WorkManager;
-
import java.util.ArrayList;
import java.util.List;
-
-import androidx.room.Dao;
-import androidx.room.Insert;
-import androidx.room.Update;
+import org.tasks.BuildConfig;
+import org.tasks.jobs.WorkManager;
import timber.log.Timber;
-import static com.todoroo.andlib.utility.DateUtilities.now;
-
@Dao
public abstract class TaskDao {
@@ -60,8 +57,7 @@ public abstract class TaskDao {
@androidx.room.Query("SELECT * FROM tasks WHERE _id IN (:taskIds)")
public abstract List See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.data;
public class SyncFlags {
diff --git a/app/src/main/java/com/todoroo/astrid/data/Task.java b/app/src/main/java/com/todoroo/astrid/data/Task.java
index 0b1281142..90244938e 100644
--- a/app/src/main/java/com/todoroo/astrid/data/Task.java
+++ b/app/src/main/java/com/todoroo/astrid/data/Task.java
@@ -3,22 +3,23 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.data;
import static java.lang.annotation.RetentionPolicy.SOURCE;
import static org.tasks.date.DateTimeUtils.newDateTime;
-import androidx.room.ColumnInfo;
-import androidx.room.Entity;
-import androidx.room.Ignore;
-import androidx.room.Index;
-import androidx.room.PrimaryKey;
import android.content.ContentValues;
import android.database.Cursor;
import android.os.Parcel;
import android.os.Parcelable;
-import androidx.annotation.IntDef;
import android.text.TextUtils;
+import androidx.annotation.IntDef;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
import com.google.common.base.Strings;
import com.google.ical.values.RRule;
import com.todoroo.andlib.data.Property;
diff --git a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
index eaf5310a4..dab41909f 100644
--- a/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/files/FilesControlSet.java
@@ -3,8 +3,18 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.files;
+import static android.app.Activity.RESULT_OK;
+import static org.tasks.data.TaskAttachment.createNewAttachment;
+import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_AUDIO;
+import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_CAMERA;
+import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_GALLERY;
+import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_STORAGE;
+import static org.tasks.dialogs.AddAttachmentDialog.newAddAttachmentDialog;
+import static org.tasks.files.FileHelper.copyToUri;
+
import android.annotation.SuppressLint;
import android.content.Context;
import android.content.Intent;
@@ -15,9 +25,12 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.TextView;
-
+import androidx.annotation.Nullable;
+import butterknife.BindView;
+import butterknife.OnClick;
import com.todoroo.astrid.data.Task;
-
+import java.util.ArrayList;
+import javax.inject.Inject;
import org.tasks.R;
import org.tasks.data.TaskAttachment;
import org.tasks.data.TaskAttachmentDao;
@@ -28,23 +41,6 @@ import org.tasks.injection.FragmentComponent;
import org.tasks.preferences.Preferences;
import org.tasks.ui.TaskEditControlFragment;
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-import butterknife.BindView;
-import butterknife.OnClick;
-
-import static android.app.Activity.RESULT_OK;
-import static org.tasks.data.TaskAttachment.createNewAttachment;
-import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_AUDIO;
-import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_CAMERA;
-import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_GALLERY;
-import static org.tasks.dialogs.AddAttachmentDialog.REQUEST_STORAGE;
-import static org.tasks.dialogs.AddAttachmentDialog.newAddAttachmentDialog;
-import static org.tasks.files.FileHelper.copyToUri;
-
public class FilesControlSet extends TaskEditControlFragment {
public static final int TAG = R.string.TEA_ctrl_files_pref;
@@ -90,8 +86,7 @@ public class FilesControlSet extends TaskEditControlFragment {
@OnClick(R.id.add_attachment)
void addAttachment(View view) {
- newAddAttachmentDialog(this)
- .show(getFragmentManager(), FRAG_TAG_ADD_ATTACHMENT_DIALOG);
+ newAddAttachmentDialog(this).show(getFragmentManager(), FRAG_TAG_ADD_ATTACHMENT_DIALOG);
}
@Override
diff --git a/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java b/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java
index 90e1abbe6..4e6a2b7eb 100644
--- a/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java
+++ b/app/src/main/java/com/todoroo/astrid/gcal/GCalHelper.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gcal;
import android.content.ContentResolver;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
index f337c4148..7f2d839cf 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks;
import static com.google.common.collect.Lists.newArrayList;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java
index 12fb7e918..0be6f568d 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java
@@ -3,27 +3,24 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks;
+import static com.google.common.collect.Lists.newArrayList;
+import static org.tasks.time.DateTimeUtils.printTimestamp;
+
import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.service.TaskDeleter;
-
-import org.tasks.LocalBroadcastManager;
-import org.tasks.data.GoogleTaskAccount;
-import org.tasks.data.GoogleTaskList;
-import org.tasks.data.GoogleTaskListDao;
-
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
import javax.inject.Inject;
-
+import org.tasks.LocalBroadcastManager;
+import org.tasks.data.GoogleTaskAccount;
+import org.tasks.data.GoogleTaskList;
+import org.tasks.data.GoogleTaskListDao;
import timber.log.Timber;
-import static com.google.common.collect.Lists.newArrayList;
-import static org.tasks.time.DateTimeUtils.printTimestamp;
-
public class GtasksListService {
private final GoogleTaskListDao googleTaskListDao;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java
index 773343609..1b95df511 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksSubtaskListFragment.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks;
import android.app.Activity;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
index 037ea81a0..bbf1989fa 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks;
import com.todoroo.astrid.api.Filter;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java b/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
index d48655237..800232aba 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/OrderedMetadataListFragmentHelper.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks;
import android.text.TextUtils;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java
index c6570944c..1b7c90837 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilities.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks.api;
import com.google.api.client.util.DateTime;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
index 1af68e58f..cae351fec 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
@@ -1,7 +1,6 @@
package com.todoroo.astrid.gtasks.api;
import android.content.Context;
-
import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;
import com.google.api.client.http.HttpRequest;
import com.google.api.client.http.HttpResponse;
@@ -15,12 +14,9 @@ import com.google.api.services.tasks.TasksScopes;
import com.google.api.services.tasks.model.Task;
import com.google.api.services.tasks.model.TaskList;
import com.google.api.services.tasks.model.TaskLists;
-
-import org.tasks.BuildConfig;
-
import java.io.IOException;
import java.util.Collections;
-
+import org.tasks.BuildConfig;
import timber.log.Timber;
/**
@@ -34,9 +30,10 @@ public class GtasksInvoker {
private final Tasks service;
public GtasksInvoker(Context context, String account) {
- GoogleAccountCredential credential = GoogleAccountCredential.usingOAuth2(context, Collections.singletonList(TasksScopes.TASKS))
- .setBackOff(new ExponentialBackOff.Builder().build())
- .setSelectedAccountName(account);
+ GoogleAccountCredential credential =
+ GoogleAccountCredential.usingOAuth2(context, Collections.singletonList(TasksScopes.TASKS))
+ .setBackOff(new ExponentialBackOff.Builder().build())
+ .setSelectedAccountName(account);
service =
new Tasks.Builder(new NetHttpTransport(), new JacksonFactory(), credential)
.setApplicationName(String.format("Tasks/%s", BuildConfig.VERSION_NAME))
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java b/app/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java
index 65831c0cc..0a9fa0945 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/MoveRequest.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks.api;
import com.google.api.services.tasks.model.Task;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
index ad656d8fb..c05903669 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks.auth;
import android.app.ProgressDialog;
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
index d5a682540..2eb7d1ff5 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
@@ -3,11 +3,11 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks.sync;
import android.content.Context;
import android.text.TextUtils;
-
import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.dao.TaskDao;
@@ -15,7 +15,13 @@ import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.gtasks.GtasksTaskListUpdater;
import com.todoroo.astrid.gtasks.api.GtasksInvoker;
import com.todoroo.astrid.gtasks.api.MoveRequest;
-
+import java.io.IOException;
+import java.util.List;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+import javax.inject.Inject;
import org.tasks.analytics.Tracker;
import org.tasks.data.GoogleTask;
import org.tasks.data.GoogleTaskDao;
@@ -25,16 +31,6 @@ import org.tasks.gtasks.GtaskSyncAdapterHelper;
import org.tasks.injection.ApplicationScope;
import org.tasks.injection.ForApplication;
import org.tasks.preferences.Preferences;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-
import timber.log.Timber;
@ApplicationScope
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
index 1a3a2cd23..c295aa2b6 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksTaskContainer.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.gtasks.sync;
import static org.tasks.gtasks.GoogleTaskSynchronizer.mergeDates;
diff --git a/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java b/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java
index cfa213718..425b60b5e 100644
--- a/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java
+++ b/app/src/main/java/com/todoroo/astrid/notes/CommentsController.java
@@ -3,8 +3,12 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.notes;
+import static androidx.core.content.ContextCompat.getColor;
+import static org.tasks.files.ImageHelper.sampleBitmap;
+
import android.app.Activity;
import android.graphics.Color;
import android.net.Uri;
@@ -15,23 +19,16 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
-
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.data.Task;
-
+import java.util.ArrayList;
+import javax.inject.Inject;
import org.tasks.R;
import org.tasks.data.UserActivity;
import org.tasks.data.UserActivityDao;
import org.tasks.files.FileHelper;
import org.tasks.preferences.Preferences;
-import java.util.ArrayList;
-
-import javax.inject.Inject;
-
-import static androidx.core.content.ContextCompat.getColor;
-import static org.tasks.files.ImageHelper.sampleBitmap;
-
public class CommentsController {
private final UserActivityDao userActivityDao;
diff --git a/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java
index c971f925f..31d53d93d 100644
--- a/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java
+++ b/app/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.provider;
import android.content.ContentValues;
diff --git a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
index 01829814e..875a5e21b 100644
--- a/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
+++ b/app/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.reminders;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow;
diff --git a/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
index 1e52e6cf4..38e95f304 100644
--- a/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
+++ b/app/src/main/java/com/todoroo/astrid/reminders/ReminderService.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.reminders;
import com.todoroo.andlib.utility.DateUtilities;
diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
index 890bc2594..a5de26eaf 100644
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.repeats;
import static androidx.core.content.ContextCompat.getColor;
@@ -14,10 +15,6 @@ import static org.tasks.time.DateTimeUtils.currentTimeMillis;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
@@ -26,6 +23,10 @@ import android.widget.AdapterView;
import android.widget.LinearLayout;
import android.widget.Spinner;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
import butterknife.BindView;
import butterknife.OnClick;
import butterknife.OnItemSelected;
diff --git a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.java b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.java
index 6d5167cd0..b1ef08b2d 100644
--- a/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.java
+++ b/app/src/main/java/com/todoroo/astrid/repeats/RepeatTaskHelper.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.repeats;
import static org.tasks.date.DateTimeUtils.newDate;
diff --git a/app/src/main/java/com/todoroo/astrid/service/StartupService.java b/app/src/main/java/com/todoroo/astrid/service/StartupService.java
index d76071b53..86be8f797 100644
--- a/app/src/main/java/com/todoroo/astrid/service/StartupService.java
+++ b/app/src/main/java/com/todoroo/astrid/service/StartupService.java
@@ -3,11 +3,13 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.service;
+import static com.google.common.base.Strings.isNullOrEmpty;
+
import android.content.Context;
import android.os.Environment;
-
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableListMultimap;
@@ -16,7 +18,9 @@ import com.google.common.collect.Multimaps;
import com.todoroo.astrid.api.GtasksFilter;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.tags.TagService;
-
+import java.io.File;
+import java.util.List;
+import javax.inject.Inject;
import org.tasks.BuildConfig;
import org.tasks.LocalBroadcastManager;
import org.tasks.R;
@@ -39,16 +43,8 @@ import org.tasks.injection.ForApplication;
import org.tasks.preferences.DefaultFilterProvider;
import org.tasks.preferences.Preferences;
import org.tasks.scheduling.BackgroundScheduler;
-
-import java.io.File;
-import java.util.List;
-
-import javax.inject.Inject;
-
import timber.log.Timber;
-import static com.google.common.base.Strings.isNullOrEmpty;
-
public class StartupService {
private static final int V4_8_0 = 380;
diff --git a/app/src/main/java/com/todoroo/astrid/service/SyncV2Service.java b/app/src/main/java/com/todoroo/astrid/service/SyncV2Service.java
index 8d374b399..1eb8c7978 100644
--- a/app/src/main/java/com/todoroo/astrid/service/SyncV2Service.java
+++ b/app/src/main/java/com/todoroo/astrid/service/SyncV2Service.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.service;
import com.todoroo.astrid.gtasks.sync.GtasksSyncService;
diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java
index e733fb3fe..d2165b017 100644
--- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.subtasks;
import android.app.Activity;
diff --git a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
index cdd67a900..546ea7fb9 100644
--- a/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
+++ b/app/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.subtasks;
import android.app.Activity;
diff --git a/app/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java b/app/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java
index b8cc433c5..bf7b68136 100644
--- a/app/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java
+++ b/app/src/main/java/com/todoroo/astrid/sync/SyncResultCallback.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.sync;
public interface SyncResultCallback {
diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
index aaa54670e..d1ed1b14a 100644
--- a/app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.tags;
import com.google.common.base.Strings;
diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagService.java b/app/src/main/java/com/todoroo/astrid/tags/TagService.java
index 84d92435b..0e3d42975 100644
--- a/app/src/main/java/com/todoroo/astrid/tags/TagService.java
+++ b/app/src/main/java/com/todoroo/astrid/tags/TagService.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.tags;
import static com.google.common.collect.Lists.newArrayList;
diff --git a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
index 58337248c..2d229cad7 100644
--- a/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.tags;
import static com.google.common.base.Predicates.notNull;
@@ -72,20 +73,23 @@ public final class TagsControlSet extends TaskEditControlFragment {
private static final String EXTRA_NEW_TAGS = "extra_new_tags";
private static final String EXTRA_ORIGINAL_TAGS = "extra_original_tags";
private static final String EXTRA_SELECTED_TAGS = "extra_selected_tags";
-
+ private final Ordering See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.timers;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
import android.os.SystemClock;
-import androidx.annotation.Nullable;
-import androidx.appcompat.app.AlertDialog;
import android.text.TextUtils;
import android.text.format.DateFormat;
import android.text.format.DateUtils;
@@ -20,6 +19,8 @@ import android.view.ViewGroup;
import android.widget.Chronometer;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
import butterknife.BindView;
import butterknife.OnClick;
import com.todoroo.andlib.utility.DateUtilities;
@@ -205,7 +206,7 @@ public class TimerControlSet extends TaskEditControlFragment {
private void updateChronometer() {
timerButton.setImageResource(
- timerActive() ? R.drawable.ic_outline_pause_24px: R.drawable.ic_outline_play_arrow_24px);
+ timerActive() ? R.drawable.ic_outline_pause_24px : R.drawable.ic_outline_play_arrow_24px);
long elapsed = this.elapsed.getTimeDurationInSeconds() * 1000L;
if (timerActive()) {
diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java
index 9326b14da..c76ea7dfe 100644
--- a/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java
+++ b/app/src/main/java/com/todoroo/astrid/timers/TimerFilterExposer.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.timers;
import static com.google.common.collect.Lists.newArrayList;
diff --git a/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java
index 147acf0d0..74c50f411 100644
--- a/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java
+++ b/app/src/main/java/com/todoroo/astrid/timers/TimerPlugin.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.timers;
import static org.tasks.time.DateTimeUtils.currentTimeMillis;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java b/app/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java
index 2f5d76972..7466b4af2 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/CheckableImageView.java
@@ -3,13 +3,14 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
-import androidx.appcompat.widget.AppCompatImageView;
import android.util.AttributeSet;
import android.view.ViewDebug;
import android.widget.Checkable;
+import androidx.appcompat.widget.AppCompatImageView;
public class CheckableImageView extends AppCompatImageView implements Checkable {
diff --git a/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
index ee2121577..dcc7999a0 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
index 1c910e3ae..11b24b075 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import static androidx.core.content.ContextCompat.getColor;
@@ -17,8 +18,6 @@ import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -28,6 +27,8 @@ import android.widget.ArrayAdapter;
import android.widget.ImageView;
import android.widget.Spinner;
import android.widget.TextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.OnClick;
import com.todoroo.andlib.utility.DateUtilities;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java b/app/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java
index 4feff88d5..b407d65e4 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/MultilineCheckboxPreference.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java b/app/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java
index b91257e67..805c306d7 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/MultilineHelper.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.view.View;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java b/app/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java
index 0f7015f62..dc3126dde 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/MultilineListPreference.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java b/app/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java
index b73b637ff..1c09214fe 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/MultilinePreference.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java b/app/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java
index 1799f8bb4..74b447542 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java
@@ -3,18 +3,19 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
-import androidx.appcompat.app.AlertDialog;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout.LayoutParams;
import android.widget.LinearLayout;
import android.widget.TextView;
+import androidx.appcompat.app.AlertDialog;
import java.util.LinkedList;
import java.util.List;
import org.tasks.R;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/NumberPicker.java b/app/src/main/java/com/todoroo/astrid/ui/NumberPicker.java
index 54f6e5d68..7ed7b43e1 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/NumberPicker.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/NumberPicker.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java b/app/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java
index 68beeb273..82208dfdd 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/NumberPickerButton.java
@@ -3,13 +3,14 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
-import androidx.appcompat.widget.AppCompatImageButton;
import android.util.AttributeSet;
import android.view.KeyEvent;
import android.view.MotionEvent;
+import androidx.appcompat.widget.AppCompatImageButton;
import org.tasks.R;
/** This class exists purely to cancel long click events. */
diff --git a/app/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java
index 965739c9c..2220dd867 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
index 329c7c6be..116c81414 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import static com.google.common.collect.Lists.transform;
diff --git a/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java b/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java
index 66522bc33..732c142d7 100644
--- a/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java
+++ b/app/src/main/java/com/todoroo/astrid/ui/TimeDurationControlSet.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.ui;
import android.content.Context;
diff --git a/app/src/main/java/com/todoroo/astrid/utility/Constants.java b/app/src/main/java/com/todoroo/astrid/utility/Constants.java
index 267a16c3e..5990751e1 100644
--- a/app/src/main/java/com/todoroo/astrid/utility/Constants.java
+++ b/app/src/main/java/com/todoroo/astrid/utility/Constants.java
@@ -3,13 +3,15 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.utility;
import org.tasks.BuildConfig;
public final class Constants {
- public static final String FILE_PROVIDER_AUTHORITY = BuildConfig.APPLICATION_ID + ".file_provider";
+ public static final String FILE_PROVIDER_AUTHORITY =
+ BuildConfig.APPLICATION_ID + ".file_provider";
/** Notification Manager id for timing */
public static final int NOTIFICATION_TIMER = -2;
diff --git a/app/src/main/java/com/todoroo/astrid/utility/Flags.java b/app/src/main/java/com/todoroo/astrid/utility/Flags.java
index fb7f96b1e..a8eb4ccae 100644
--- a/app/src/main/java/com/todoroo/astrid/utility/Flags.java
+++ b/app/src/main/java/com/todoroo/astrid/utility/Flags.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.utility;
public class Flags {
diff --git a/app/src/main/java/com/todoroo/astrid/utility/TitleParser.java b/app/src/main/java/com/todoroo/astrid/utility/TitleParser.java
index 4ff858b23..0e8444f2a 100644
--- a/app/src/main/java/com/todoroo/astrid/utility/TitleParser.java
+++ b/app/src/main/java/com/todoroo/astrid/utility/TitleParser.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package com.todoroo.astrid.utility;
import android.text.TextUtils;
diff --git a/app/src/main/java/com/todoroo/astrid/voice/AACRecorder.java b/app/src/main/java/com/todoroo/astrid/voice/AACRecorder.java
index 0b4819123..9db84b952 100644
--- a/app/src/main/java/com/todoroo/astrid/voice/AACRecorder.java
+++ b/app/src/main/java/com/todoroo/astrid/voice/AACRecorder.java
@@ -1,17 +1,14 @@
package com.todoroo.astrid.voice;
-import androidx.lifecycle.ViewModel;
-
import android.content.Context;
import android.media.MediaRecorder;
import android.net.Uri;
import android.os.SystemClock;
+import androidx.lifecycle.ViewModel;
import java.io.IOException;
-
import org.tasks.files.FileHelper;
import org.tasks.preferences.Preferences;
import org.tasks.time.DateTime;
-
import timber.log.Timber;
public class AACRecorder extends ViewModel {
diff --git a/app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java b/app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java
index 7bdb7756f..34f48b4a7 100644
--- a/app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java
+++ b/app/src/main/java/com/todoroo/astrid/voice/VoiceOutputAssistant.java
@@ -1,4 +1,5 @@
/** */
+
package com.todoroo.astrid.voice;
import android.content.Context;
diff --git a/app/src/main/java/org/tasks/LocalBroadcastManager.java b/app/src/main/java/org/tasks/LocalBroadcastManager.java
index dfefa5675..88504d400 100644
--- a/app/src/main/java/org/tasks/LocalBroadcastManager.java
+++ b/app/src/main/java/org/tasks/LocalBroadcastManager.java
@@ -22,7 +22,8 @@ public class LocalBroadcastManager {
@Inject
public LocalBroadcastManager(@ForApplication Context context, AppWidgetManager appWidgetManager) {
this.appWidgetManager = appWidgetManager;
- localBroadcastManager = androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(context);
+ localBroadcastManager =
+ androidx.localbroadcastmanager.content.LocalBroadcastManager.getInstance(context);
}
public void registerRefreshReceiver(BroadcastReceiver broadcastReceiver) {
diff --git a/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java b/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
index cd3d02c11..9d9a2d692 100644
--- a/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
+++ b/app/src/main/java/org/tasks/activities/CalendarSelectionDialog.java
@@ -7,10 +7,10 @@ import android.app.Activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
import android.widget.ListView;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
import com.google.common.base.Strings;
import java.util.ArrayList;
import java.util.List;
@@ -67,12 +67,13 @@ public class CalendarSelectionDialog extends InjectingDialogFragment {
}
};
- AlertDialog dialog = dialogBuilder
- .newDialog()
- .setSingleChoiceItems(
- adapter, -1, (d, which) -> handler.selectedCalendar(calendars.get(which)))
- .setOnDismissListener(dialogInterface -> handler.cancel())
- .show();
+ AlertDialog dialog =
+ dialogBuilder
+ .newDialog()
+ .setSingleChoiceItems(
+ adapter, -1, (d, which) -> handler.selectedCalendar(calendars.get(which)))
+ .setOnDismissListener(dialogInterface -> handler.cancel())
+ .show();
listView = dialog.getListView();
if (permissionChecker.canAccessCalendars()) {
loadCalendars();
diff --git a/app/src/main/java/org/tasks/activities/CameraActivity.java b/app/src/main/java/org/tasks/activities/CameraActivity.java
index 689eb35cc..03254c55d 100644
--- a/app/src/main/java/org/tasks/activities/CameraActivity.java
+++ b/app/src/main/java/org/tasks/activities/CameraActivity.java
@@ -1,5 +1,7 @@
package org.tasks.activities;
+import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
+
import android.annotation.SuppressLint;
import android.content.ContentResolver;
import android.content.Intent;
@@ -8,25 +10,18 @@ import android.content.pm.ResolveInfo;
import android.net.Uri;
import android.os.Bundle;
import android.provider.MediaStore;
-
+import androidx.core.content.FileProvider;
import com.todoroo.astrid.utility.Constants;
-
+import java.io.File;
+import java.io.IOException;
+import java.util.List;
+import javax.inject.Inject;
import org.tasks.files.FileHelper;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity;
import org.tasks.preferences.Preferences;
import org.tasks.time.DateTime;
-import java.io.File;
-import java.io.IOException;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import androidx.core.content.FileProvider;
-
-import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
-
public class CameraActivity extends InjectingAppCompatActivity {
private static final int REQUEST_CODE_CAMERA = 75;
@@ -86,9 +81,9 @@ public class CameraActivity extends InjectingAppCompatActivity {
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_CAMERA) {
if (resultCode == RESULT_OK) {
- Intent intent = new Intent();
- intent.setData(uri);
- setResult(RESULT_OK, intent);
+ Intent intent = new Intent();
+ intent.setData(uri);
+ setResult(RESULT_OK, intent);
}
finish();
} else {
diff --git a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
index 4335e9066..4e3fbac97 100644
--- a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package org.tasks.activities;
import static android.text.TextUtils.isEmpty;
@@ -10,15 +11,15 @@ import static android.text.TextUtils.isEmpty;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnTextChanged;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
import com.todoroo.astrid.api.CustomFilter;
import javax.inject.Inject;
import org.tasks.R;
@@ -63,7 +64,10 @@ public class FilterSettingsActivity extends ThemedInjectingAppCompatActivity
final boolean backButtonSavesTask = preferences.backButtonSavesTask();
toolbar.setNavigationIcon(
ContextCompat.getDrawable(
- this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
+ this,
+ backButtonSavesTask
+ ? R.drawable.ic_outline_clear_24px
+ : R.drawable.ic_outline_save_24px));
toolbar.setTitle(filter.listingTitle);
toolbar.setNavigationOnClickListener(
v -> {
diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
index 257577694..8fdc855f8 100644
--- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.java
@@ -8,17 +8,17 @@ import static org.tasks.gtasks.RenameListDialog.newRenameListDialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import com.google.android.material.textfield.TextInputEditText;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
import android.text.InputType;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
import android.widget.Toast;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnFocusChange;
+import com.google.android.material.textfield.TextInputEditText;
import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.api.GtasksFilter;
@@ -105,7 +105,10 @@ public class GoogleTaskListSettingsActivity extends ThemedInjectingAppCompatActi
toolbar.setTitle(isNewList ? getString(R.string.new_list) : gtasksList.getTitle());
toolbar.setNavigationIcon(
ContextCompat.getDrawable(
- this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
+ this,
+ backButtonSavesTask
+ ? R.drawable.ic_outline_clear_24px
+ : R.drawable.ic_outline_save_24px));
toolbar.setNavigationOnClickListener(
v -> {
if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/activities/RemoteListSupportPicker.java b/app/src/main/java/org/tasks/activities/RemoteListSupportPicker.java
index 22af2a02a..27d51ff0a 100644
--- a/app/src/main/java/org/tasks/activities/RemoteListSupportPicker.java
+++ b/app/src/main/java/org/tasks/activities/RemoteListSupportPicker.java
@@ -5,8 +5,8 @@ import android.app.Dialog;
import android.content.Intent;
import android.os.Bundle;
import androidx.annotation.NonNull;
-import androidx.fragment.app.Fragment;
import androidx.appcompat.app.AlertDialog;
+import androidx.fragment.app.Fragment;
import com.todoroo.astrid.adapter.FilterAdapter;
import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.api.Filter;
diff --git a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
index b9e65614d..b6446c321 100644
--- a/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
+++ b/app/src/main/java/org/tasks/activities/TagSettingsActivity.java
@@ -3,6 +3,7 @@
*
* See the file "LICENSE" for the full license governing this code.
*/
+
package org.tasks.activities;
import static android.text.TextUtils.isEmpty;
@@ -10,18 +11,18 @@ import static android.text.TextUtils.isEmpty;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
import android.text.InputType;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnFocusChange;
import butterknife.OnTextChanged;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.api.TagFilter;
import com.todoroo.astrid.helper.UUIDHelper;
@@ -98,7 +99,10 @@ public class TagSettingsActivity extends ThemedInjectingAppCompatActivity
toolbar.setTitle(isNewTag ? getString(R.string.new_tag) : tagData.getName());
toolbar.setNavigationIcon(
ContextCompat.getDrawable(
- this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
+ this,
+ backButtonSavesTask
+ ? R.drawable.ic_outline_clear_24px
+ : R.drawable.ic_outline_save_24px));
toolbar.setNavigationOnClickListener(
v -> {
if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/backup/TasksJsonExporter.java b/app/src/main/java/org/tasks/backup/TasksJsonExporter.java
index 259ca2be5..3c25aff0b 100755
--- a/app/src/main/java/org/tasks/backup/TasksJsonExporter.java
+++ b/app/src/main/java/org/tasks/backup/TasksJsonExporter.java
@@ -1,12 +1,14 @@
package org.tasks.backup;
+import static org.tasks.date.DateTimeUtils.newDateTime;
+
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
import android.net.Uri;
import android.os.Handler;
import android.widget.Toast;
-
+import androidx.annotation.Nullable;
import com.google.common.io.Files;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -14,7 +16,14 @@ import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.backup.BackupConstants;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
-
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.inject.Inject;
import org.tasks.BuildConfig;
import org.tasks.R;
import org.tasks.data.AlarmDao;
@@ -31,22 +40,8 @@ import org.tasks.drive.DriveInvoker;
import org.tasks.files.FileHelper;
import org.tasks.jobs.WorkManager;
import org.tasks.preferences.Preferences;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
import timber.log.Timber;
-import static org.tasks.date.DateTimeUtils.newDateTime;
-
public class TasksJsonExporter {
private static final String MIME = "application/json";
diff --git a/app/src/main/java/org/tasks/backup/TasksJsonImporter.java b/app/src/main/java/org/tasks/backup/TasksJsonImporter.java
index 4ebb3c496..5756d58fd 100644
--- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.java
+++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.java
@@ -5,14 +5,17 @@ import android.app.ProgressDialog;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Handler;
-
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.todoroo.andlib.utility.DialogUtilities;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.data.Task;
-
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import javax.inject.Inject;
import org.tasks.LocalBroadcastManager;
import org.tasks.R;
import org.tasks.data.Alarm;
@@ -39,14 +42,6 @@ import org.tasks.data.TaskAttachmentDao;
import org.tasks.data.UserActivity;
import org.tasks.data.UserActivityDao;
import org.tasks.dialogs.DialogBuilder;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-import javax.inject.Inject;
-
import timber.log.Timber;
public class TasksJsonImporter {
diff --git a/app/src/main/java/org/tasks/billing/CardsWithHeadersDecoration.java b/app/src/main/java/org/tasks/billing/CardsWithHeadersDecoration.java
index 97d9956f2..19317688a 100644
--- a/app/src/main/java/org/tasks/billing/CardsWithHeadersDecoration.java
+++ b/app/src/main/java/org/tasks/billing/CardsWithHeadersDecoration.java
@@ -11,11 +11,12 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
+
package org.tasks.billing;
import android.graphics.Rect;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
+import androidx.recyclerview.widget.RecyclerView;
import org.tasks.billing.row.RowDataProvider;
import org.tasks.billing.row.SkuRowData;
diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.java b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
index a5bbf089d..f133afd6b 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseActivity.java
+++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.java
@@ -16,13 +16,13 @@ import android.content.Intent;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import android.view.MenuItem;
import android.view.View;
import android.widget.TextView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import com.android.billingclient.api.BillingClient.BillingResponse;
diff --git a/app/src/main/java/org/tasks/billing/SkusAdapter.java b/app/src/main/java/org/tasks/billing/SkusAdapter.java
index 997c9be97..cc26a264b 100644
--- a/app/src/main/java/org/tasks/billing/SkusAdapter.java
+++ b/app/src/main/java/org/tasks/billing/SkusAdapter.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.tasks.billing;
import static com.google.common.collect.Lists.transform;
@@ -20,11 +21,11 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
import static java.util.Arrays.asList;
import android.content.Context;
-import androidx.annotation.IntDef;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.IntDef;
+import androidx.recyclerview.widget.RecyclerView;
import com.android.billingclient.api.BillingClient.SkuType;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList;
diff --git a/app/src/main/java/org/tasks/billing/row/RowDataProvider.java b/app/src/main/java/org/tasks/billing/row/RowDataProvider.java
index 2c798dd08..a61835e72 100644
--- a/app/src/main/java/org/tasks/billing/row/RowDataProvider.java
+++ b/app/src/main/java/org/tasks/billing/row/RowDataProvider.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.tasks.billing.row;
/** Provider for data that corresponds to a particular row */
diff --git a/app/src/main/java/org/tasks/billing/row/RowViewHolder.java b/app/src/main/java/org/tasks/billing/row/RowViewHolder.java
index 63dfbfad6..cb3f537a7 100644
--- a/app/src/main/java/org/tasks/billing/row/RowViewHolder.java
+++ b/app/src/main/java/org/tasks/billing/row/RowViewHolder.java
@@ -1,9 +1,9 @@
package org.tasks.billing.row;
-import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
+import androidx.recyclerview.widget.RecyclerView;
import org.tasks.R;
public final class RowViewHolder extends RecyclerView.ViewHolder {
diff --git a/app/src/main/java/org/tasks/billing/row/SkuRowData.java b/app/src/main/java/org/tasks/billing/row/SkuRowData.java
index bc069ffcd..028b5cf90 100644
--- a/app/src/main/java/org/tasks/billing/row/SkuRowData.java
+++ b/app/src/main/java/org/tasks/billing/row/SkuRowData.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.tasks.billing.row;
import com.android.billingclient.api.BillingClient.SkuType;
diff --git a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
index bf29b3f6e..fd8e122e3 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavAccountSettingsActivity.java
@@ -7,19 +7,19 @@ import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
-import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
import at.bitfire.dav4android.exception.HttpException;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnFocusChange;
import butterknife.OnTextChanged;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
import com.todoroo.astrid.helper.UUIDHelper;
import com.todoroo.astrid.service.TaskDeleter;
import java.net.ConnectException;
@@ -113,7 +113,10 @@ public class CaldavAccountSettingsActivity extends ThemedInjectingAppCompatActiv
caldavAccount == null ? getString(R.string.add_account) : caldavAccount.getName());
toolbar.setNavigationIcon(
ContextCompat.getDrawable(
- this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
+ this,
+ backButtonSavesTask
+ ? R.drawable.ic_outline_clear_24px
+ : R.drawable.ic_outline_save_24px));
toolbar.setNavigationOnClickListener(
v -> {
if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
index ce22b0b62..f923ce182 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.java
@@ -6,23 +6,23 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
-import com.google.android.material.snackbar.Snackbar;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
-import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import android.text.InputType;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.LinearLayout;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
+import androidx.core.content.ContextCompat;
import at.bitfire.dav4android.exception.HttpException;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnFocusChange;
import butterknife.OnTextChanged;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.api.CaldavFilter;
import com.todoroo.astrid.helper.UUIDHelper;
@@ -121,7 +121,10 @@ public class CaldavCalendarSettingsActivity extends ThemedInjectingAppCompatActi
caldavCalendar == null ? getString(R.string.new_list) : caldavCalendar.getName());
toolbar.setNavigationIcon(
ContextCompat.getDrawable(
- this, backButtonSavesTask ? R.drawable.ic_outline_clear_24px : R.drawable.ic_outline_save_24px));
+ this,
+ backButtonSavesTask
+ ? R.drawable.ic_outline_clear_24px
+ : R.drawable.ic_outline_save_24px));
toolbar.setNavigationOnClickListener(
v -> {
if (backButtonSavesTask) {
diff --git a/app/src/main/java/org/tasks/caldav/CaldavConverter.java b/app/src/main/java/org/tasks/caldav/CaldavConverter.java
index 0b5e8ea44..0fde68211 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavConverter.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavConverter.java
@@ -64,7 +64,8 @@ public class CaldavConverter {
} else {
Date dueDate = due.getDate();
if (dueDate instanceof DateTime) {
- local.setDueDateAdjustingHideUntil(Task.createDueDate(URGENCY_SPECIFIC_DAY_TIME, dueDate.getTime()));
+ local.setDueDateAdjustingHideUntil(
+ Task.createDueDate(URGENCY_SPECIFIC_DAY_TIME, dueDate.getTime()));
} else {
try {
local.setDueDateAdjustingHideUntil(
diff --git a/app/src/main/java/org/tasks/caldav/CaldavListFragment.java b/app/src/main/java/org/tasks/caldav/CaldavListFragment.java
index a0a71a53e..158431ac7 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavListFragment.java
+++ b/app/src/main/java/org/tasks/caldav/CaldavListFragment.java
@@ -4,8 +4,8 @@ import static android.app.Activity.RESULT_OK;
import android.content.Intent;
import android.os.Bundle;
-import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
+import androidx.appcompat.widget.Toolbar;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.CaldavFilter;
diff --git a/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java b/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java
index 9c41d5974..ea037be57 100644
--- a/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java
+++ b/app/src/main/java/org/tasks/calendars/CalendarEventProvider.java
@@ -7,8 +7,8 @@ import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.provider.CalendarContract;
-import androidx.annotation.Nullable;
import android.text.TextUtils;
+import androidx.annotation.Nullable;
import com.todoroo.astrid.data.Task;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/app/src/main/java/org/tasks/data/CaldavAccount.java b/app/src/main/java/org/tasks/data/CaldavAccount.java
index df87fdee8..fb4e36484 100644
--- a/app/src/main/java/org/tasks/data/CaldavAccount.java
+++ b/app/src/main/java/org/tasks/data/CaldavAccount.java
@@ -2,12 +2,12 @@ package org.tasks.data;
import static com.todoroo.astrid.data.Task.NO_UUID;
+import android.os.Parcel;
+import android.os.Parcelable;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Ignore;
import androidx.room.PrimaryKey;
-import android.os.Parcel;
-import android.os.Parcelable;
@Entity(tableName = "caldav_account")
public class CaldavAccount implements Parcelable {
diff --git a/app/src/main/java/org/tasks/data/CaldavCalendar.java b/app/src/main/java/org/tasks/data/CaldavCalendar.java
index 60154a57a..45b096996 100644
--- a/app/src/main/java/org/tasks/data/CaldavCalendar.java
+++ b/app/src/main/java/org/tasks/data/CaldavCalendar.java
@@ -2,12 +2,12 @@ package org.tasks.data;
import static com.todoroo.astrid.data.Task.NO_UUID;
+import android.os.Parcel;
+import android.os.Parcelable;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Ignore;
import androidx.room.PrimaryKey;
-import android.os.Parcel;
-import android.os.Parcelable;
@Entity(tableName = "caldav_calendar")
public final class CaldavCalendar implements Parcelable {
diff --git a/app/src/main/java/org/tasks/data/GoogleTaskAccount.java b/app/src/main/java/org/tasks/data/GoogleTaskAccount.java
index 23539e1b9..0bd4f593f 100644
--- a/app/src/main/java/org/tasks/data/GoogleTaskAccount.java
+++ b/app/src/main/java/org/tasks/data/GoogleTaskAccount.java
@@ -1,11 +1,11 @@
package org.tasks.data;
+import android.os.Parcel;
+import android.os.Parcelable;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Ignore;
import androidx.room.PrimaryKey;
-import android.os.Parcel;
-import android.os.Parcelable;
@Entity(tableName = "google_task_accounts")
public class GoogleTaskAccount implements Parcelable {
diff --git a/app/src/main/java/org/tasks/data/GoogleTaskList.java b/app/src/main/java/org/tasks/data/GoogleTaskList.java
index 577910c72..fcb4d59b4 100644
--- a/app/src/main/java/org/tasks/data/GoogleTaskList.java
+++ b/app/src/main/java/org/tasks/data/GoogleTaskList.java
@@ -1,11 +1,11 @@
package org.tasks.data;
+import android.os.Parcel;
+import android.os.Parcelable;
import androidx.room.ColumnInfo;
import androidx.room.Entity;
import androidx.room.Ignore;
import androidx.room.PrimaryKey;
-import android.os.Parcel;
-import android.os.Parcelable;
@Entity(tableName = "google_task_lists")
public class GoogleTaskList implements Parcelable {
diff --git a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
index 565230e15..f7a3ede74 100644
--- a/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
+++ b/app/src/main/java/org/tasks/data/LimitOffsetDataSource.java
@@ -1,11 +1,11 @@
package org.tasks.data;
-import androidx.paging.PositionalDataSource;
-import androidx.room.RoomDatabase;
import android.database.Cursor;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.WorkerThread;
+import androidx.paging.PositionalDataSource;
+import androidx.room.RoomDatabase;
import com.todoroo.astrid.data.Task;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/app/src/main/java/org/tasks/data/Location.java b/app/src/main/java/org/tasks/data/Location.java
index 8dd5a1872..7e50e3609 100644
--- a/app/src/main/java/org/tasks/data/Location.java
+++ b/app/src/main/java/org/tasks/data/Location.java
@@ -15,9 +15,6 @@ import org.tasks.backup.XmlReader;
@Entity(tableName = "locations")
public class Location implements Serializable, Parcelable {
- private static final Pattern COORDS =
- Pattern.compile("^\\d+°\\d+'\\d+\\.\\d+\"[NS] \\d+°\\d+'\\d+\\.\\d+\"[EW]$");
-
public static final Parcelable.Creator See the file "LICENSE" for the full license governing this code.
*/
+
package org.tasks.drive;
import android.app.ProgressDialog;
diff --git a/app/src/main/java/org/tasks/files/FileExplore.java b/app/src/main/java/org/tasks/files/FileExplore.java
index ba3c098a9..e604956d0 100644
--- a/app/src/main/java/org/tasks/files/FileExplore.java
+++ b/app/src/main/java/org/tasks/files/FileExplore.java
@@ -5,16 +5,13 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
-
import com.google.common.base.Strings;
import com.nononsenseapps.filepicker.FilePickerActivity;
import com.nononsenseapps.filepicker.Utils;
-
+import java.io.File;
import org.tasks.injection.ActivityComponent;
import org.tasks.injection.InjectingAppCompatActivity;
-import java.io.File;
-
public class FileExplore extends InjectingAppCompatActivity {
public static final String EXTRA_START_PATH = "extra_start_path";
diff --git a/app/src/main/java/org/tasks/files/FileHelper.java b/app/src/main/java/org/tasks/files/FileHelper.java
index b5bf7888e..9147febff 100644
--- a/app/src/main/java/org/tasks/files/FileHelper.java
+++ b/app/src/main/java/org/tasks/files/FileHelper.java
@@ -1,5 +1,14 @@
package org.tasks.files;
+import static android.content.ContentResolver.SCHEME_CONTENT;
+import static android.provider.DocumentsContract.EXTRA_INITIAL_URI;
+import static androidx.core.content.FileProvider.getUriForFile;
+import static com.google.common.collect.Iterables.any;
+import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
+import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
+import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop;
+import static com.todoroo.astrid.utility.Constants.FILE_PROVIDER_AUTHORITY;
+
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.ContentResolver;
@@ -13,12 +22,9 @@ import android.os.Build;
import android.provider.OpenableColumns;
import android.webkit.MimeTypeMap;
import android.widget.Toast;
-
+import androidx.documentfile.provider.DocumentFile;
import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
-
-import org.tasks.R;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -26,27 +32,16 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.util.Arrays;
import java.util.List;
-
import javax.annotation.Nullable;
-
-import androidx.documentfile.provider.DocumentFile;
+import org.tasks.R;
import timber.log.Timber;
-import static android.content.ContentResolver.SCHEME_CONTENT;
-import static android.provider.DocumentsContract.EXTRA_INITIAL_URI;
-import static androidx.core.content.FileProvider.getUriForFile;
-import static com.google.common.collect.Iterables.any;
-import static com.todoroo.andlib.utility.AndroidUtilities.atLeastKitKat;
-import static com.todoroo.andlib.utility.AndroidUtilities.atLeastLollipop;
-import static com.todoroo.andlib.utility.AndroidUtilities.preLollipop;
-import static com.todoroo.astrid.utility.Constants.FILE_PROVIDER_AUTHORITY;
-
public class FileHelper {
public static Intent newFilePickerIntent(Activity activity, Uri initial, String... mimeTypes) {
if (atLeastKitKat()) {
Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
- intent.putExtra("android.content.extra.SHOW_ADVANCED",true);
+ intent.putExtra("android.content.extra.SHOW_ADVANCED", true);
intent.addCategory(Intent.CATEGORY_OPENABLE);
setInitialUri(activity, intent, initial);
if (mimeTypes.length == 1) {
@@ -75,7 +70,7 @@ public class FileHelper {
| Intent.FLAG_GRANT_WRITE_URI_PERMISSION
| Intent.FLAG_GRANT_READ_URI_PERMISSION
| Intent.FLAG_GRANT_PREFIX_URI_PERMISSION);
- intent.putExtra("android.content.extra.SHOW_ADVANCED",true);
+ intent.putExtra("android.content.extra.SHOW_ADVANCED", true);
setInitialUri(activity, intent, initial);
activity.startActivityForResult(intent, rc);
} else {
@@ -191,7 +186,8 @@ public class FileHelper {
}
}
- public static Uri newFile(Context context, Uri destination, String mimeType, String baseName, String extension)
+ public static Uri newFile(
+ Context context, Uri destination, String mimeType, String baseName, String extension)
throws IOException {
String filename = getNonCollidingFileName(context, destination, baseName, extension);
switch (destination.getScheme()) {
@@ -237,7 +233,8 @@ public class FileHelper {
}
}
- private static String getNonCollidingFileName(Context context, Uri uri, String baseName, String extension) {
+ private static String getNonCollidingFileName(
+ Context context, Uri uri, String baseName, String extension) {
int tries = 1;
if (!extension.startsWith(".")) {
extension = "." + extension;
diff --git a/app/src/main/java/org/tasks/files/ImageHelper.java b/app/src/main/java/org/tasks/files/ImageHelper.java
index ff063a71e..739872567 100644
--- a/app/src/main/java/org/tasks/files/ImageHelper.java
+++ b/app/src/main/java/org/tasks/files/ImageHelper.java
@@ -5,11 +5,9 @@ import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.Uri;
-
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
-
import timber.log.Timber;
public class ImageHelper {
@@ -53,7 +51,6 @@ public class ImageHelper {
// Calculate inSampleSize
options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
-
// Decode bitmap with inSampleSize set
options.inJustDecodeBounds = false;
diff --git a/app/src/main/java/org/tasks/files/NNFileProvider.java b/app/src/main/java/org/tasks/files/NNFileProvider.java
index bd4fdbdd1..48a30f7e1 100644
--- a/app/src/main/java/org/tasks/files/NNFileProvider.java
+++ b/app/src/main/java/org/tasks/files/NNFileProvider.java
@@ -2,5 +2,4 @@ package org.tasks.files;
import androidx.core.content.FileProvider;
-public class NNFileProvider extends FileProvider {
-}
+public class NNFileProvider extends FileProvider {}
diff --git a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
index cbbd054b2..5ca6b55c0 100644
--- a/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
+++ b/app/src/main/java/org/tasks/fragments/CommentBarFragment.java
@@ -1,5 +1,7 @@
package org.tasks.fragments;
+import static org.tasks.files.ImageHelper.sampleBitmap;
+
import android.app.Activity;
import android.content.DialogInterface;
import android.content.Intent;
@@ -17,11 +19,20 @@ import android.view.inputmethod.EditorInfo;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.LinearLayout;
-
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.OnClick;
+import butterknife.OnEditorAction;
+import butterknife.OnTextChanged;
import com.google.common.base.Strings;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.astrid.data.Task;
-
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
import org.tasks.R;
import org.tasks.activities.CameraActivity;
import org.tasks.dialogs.DialogBuilder;
@@ -30,22 +41,6 @@ import org.tasks.preferences.Device;
import org.tasks.preferences.Preferences;
import org.tasks.ui.TaskEditControlFragment;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.core.graphics.drawable.DrawableCompat;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-import butterknife.OnEditorAction;
-import butterknife.OnTextChanged;
-
-import static org.tasks.files.ImageHelper.sampleBitmap;
-
public class CommentBarFragment extends TaskEditControlFragment {
public static final int TAG = R.string.TEA_ctrl_comments;
diff --git a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java
index 332a467c0..55d6fadc6 100644
--- a/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java
+++ b/app/src/main/java/org/tasks/fragments/TaskEditControlSetFragmentManager.java
@@ -12,7 +12,6 @@ import com.todoroo.astrid.tags.TagsControlSet;
import com.todoroo.astrid.timers.TimerControlSet;
import com.todoroo.astrid.ui.EditTitleControlSet;
import com.todoroo.astrid.ui.HideUntilControlSet;
-import org.tasks.ui.LocationControlSet;
import com.todoroo.astrid.ui.ReminderControlSet;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -26,6 +25,7 @@ import org.tasks.sync.SyncAdapters;
import org.tasks.ui.CalendarControlSet;
import org.tasks.ui.DeadlineControlSet;
import org.tasks.ui.DescriptionControlSet;
+import org.tasks.ui.LocationControlSet;
import org.tasks.ui.PriorityControlSet;
import org.tasks.ui.RemoteListFragment;
import org.tasks.ui.TaskEditControlFragment;
diff --git a/app/src/main/java/org/tasks/gtasks/CreateListDialog.java b/app/src/main/java/org/tasks/gtasks/CreateListDialog.java
index 4cd4a1e80..dab5990bd 100644
--- a/app/src/main/java/org/tasks/gtasks/CreateListDialog.java
+++ b/app/src/main/java/org/tasks/gtasks/CreateListDialog.java
@@ -6,22 +6,17 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.gtasks.api.GtasksInvoker;
-
+import java.io.IOException;
+import javax.inject.Inject;
import org.tasks.R;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.DialogFragmentComponent;
import org.tasks.injection.ForApplication;
import org.tasks.injection.InjectingDialogFragment;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import timber.log.Timber;
public class CreateListDialog extends InjectingDialogFragment {
diff --git a/app/src/main/java/org/tasks/gtasks/DeleteListDialog.java b/app/src/main/java/org/tasks/gtasks/DeleteListDialog.java
index 02891e54e..30c6321b2 100644
--- a/app/src/main/java/org/tasks/gtasks/DeleteListDialog.java
+++ b/app/src/main/java/org/tasks/gtasks/DeleteListDialog.java
@@ -6,22 +6,17 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.todoroo.astrid.gtasks.api.GtasksInvoker;
-
+import java.io.IOException;
+import javax.inject.Inject;
import org.tasks.R;
import org.tasks.data.GoogleTaskList;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.DialogFragmentComponent;
import org.tasks.injection.ForApplication;
import org.tasks.injection.InjectingDialogFragment;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import timber.log.Timber;
public class DeleteListDialog extends InjectingDialogFragment {
diff --git a/app/src/main/java/org/tasks/gtasks/GoogleAccountManager.java b/app/src/main/java/org/tasks/gtasks/GoogleAccountManager.java
index 5d51ce3b2..a68e9709b 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleAccountManager.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleAccountManager.java
@@ -1,21 +1,17 @@
package org.tasks.gtasks;
+import static com.google.common.collect.Iterables.tryFind;
+import static com.google.common.collect.Lists.transform;
+import static java.util.Arrays.asList;
+
import android.accounts.Account;
import android.content.Context;
-
import com.google.common.base.Strings;
-
-import org.tasks.injection.ForApplication;
-import org.tasks.preferences.PermissionChecker;
-
import java.util.Collections;
import java.util.List;
-
import javax.inject.Inject;
-
-import static com.google.common.collect.Iterables.tryFind;
-import static com.google.common.collect.Lists.transform;
-import static java.util.Arrays.asList;
+import org.tasks.injection.ForApplication;
+import org.tasks.preferences.PermissionChecker;
public class GoogleAccountManager {
diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
index dc6d86f33..9cda24393 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
@@ -1,10 +1,12 @@
package org.tasks.gtasks;
+import static org.tasks.date.DateTimeUtils.newDateTime;
+
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.text.TextUtils;
-
+import androidx.core.app.NotificationCompat;
import com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException;
import com.google.api.services.tasks.model.TaskList;
import com.google.api.services.tasks.model.TaskLists;
@@ -26,7 +28,10 @@ import com.todoroo.astrid.gtasks.sync.GtasksTaskContainer;
import com.todoroo.astrid.service.TaskCreator;
import com.todoroo.astrid.service.TaskDeleter;
import com.todoroo.astrid.utility.Constants;
-
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
import org.tasks.LocalBroadcastManager;
import org.tasks.R;
import org.tasks.analytics.Tracker;
@@ -42,18 +47,8 @@ import org.tasks.preferences.DefaultFilterProvider;
import org.tasks.preferences.PermissionChecker;
import org.tasks.preferences.Preferences;
import org.tasks.time.DateTime;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import androidx.core.app.NotificationCompat;
import timber.log.Timber;
-import static org.tasks.date.DateTimeUtils.newDateTime;
-
public class GoogleTaskSynchronizer {
private static final String DEFAULT_LIST = "@default"; // $NON-NLS-1$
diff --git a/app/src/main/java/org/tasks/gtasks/GtaskSyncAdapterHelper.java b/app/src/main/java/org/tasks/gtasks/GtaskSyncAdapterHelper.java
index 6632bd90e..904480bad 100644
--- a/app/src/main/java/org/tasks/gtasks/GtaskSyncAdapterHelper.java
+++ b/app/src/main/java/org/tasks/gtasks/GtaskSyncAdapterHelper.java
@@ -1,15 +1,13 @@
package org.tasks.gtasks;
import android.app.Activity;
-
+import javax.inject.Inject;
import org.tasks.R;
import org.tasks.analytics.Tracker;
import org.tasks.analytics.Tracking;
import org.tasks.data.GoogleTaskListDao;
import org.tasks.preferences.Preferences;
-import javax.inject.Inject;
-
public class GtaskSyncAdapterHelper {
private final Preferences preferences;
diff --git a/app/src/main/java/org/tasks/gtasks/RenameListDialog.java b/app/src/main/java/org/tasks/gtasks/RenameListDialog.java
index 757a18eb6..d22580bb6 100644
--- a/app/src/main/java/org/tasks/gtasks/RenameListDialog.java
+++ b/app/src/main/java/org/tasks/gtasks/RenameListDialog.java
@@ -6,23 +6,18 @@ import android.app.ProgressDialog;
import android.content.Context;
import android.os.AsyncTask;
import android.os.Bundle;
-
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import com.google.api.services.tasks.model.TaskList;
import com.todoroo.astrid.gtasks.api.GtasksInvoker;
-
+import java.io.IOException;
+import javax.inject.Inject;
import org.tasks.R;
import org.tasks.data.GoogleTaskList;
import org.tasks.dialogs.DialogBuilder;
import org.tasks.injection.DialogFragmentComponent;
import org.tasks.injection.ForApplication;
import org.tasks.injection.InjectingDialogFragment;
-
-import java.io.IOException;
-
-import javax.inject.Inject;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import timber.log.Timber;
public class RenameListDialog extends InjectingDialogFragment {
diff --git a/app/src/main/java/org/tasks/injection/ApplicationModule.java b/app/src/main/java/org/tasks/injection/ApplicationModule.java
index 7bfd1c170..492c5d37e 100644
--- a/app/src/main/java/org/tasks/injection/ApplicationModule.java
+++ b/app/src/main/java/org/tasks/injection/ApplicationModule.java
@@ -2,8 +2,8 @@ package org.tasks.injection;
import static com.todoroo.andlib.utility.AndroidUtilities.atLeastMarshmallow;
-import androidx.room.Room;
import android.content.Context;
+import androidx.room.Room;
import com.todoroo.astrid.dao.Database;
import com.todoroo.astrid.dao.TaskDao;
import com.todoroo.astrid.provider.Astrid2TaskProvider;
diff --git a/app/src/main/java/org/tasks/injection/FragmentComponent.java b/app/src/main/java/org/tasks/injection/FragmentComponent.java
index 24f4160eb..0292035de 100644
--- a/app/src/main/java/org/tasks/injection/FragmentComponent.java
+++ b/app/src/main/java/org/tasks/injection/FragmentComponent.java
@@ -11,7 +11,6 @@ import com.todoroo.astrid.tags.TagsControlSet;
import com.todoroo.astrid.timers.TimerControlSet;
import com.todoroo.astrid.ui.EditTitleControlSet;
import com.todoroo.astrid.ui.HideUntilControlSet;
-import org.tasks.ui.LocationControlSet;
import com.todoroo.astrid.ui.ReminderControlSet;
import dagger.Subcomponent;
import org.tasks.caldav.CaldavListFragment;
@@ -21,6 +20,7 @@ import org.tasks.tasklist.TagListFragment;
import org.tasks.ui.CalendarControlSet;
import org.tasks.ui.DeadlineControlSet;
import org.tasks.ui.DescriptionControlSet;
+import org.tasks.ui.LocationControlSet;
import org.tasks.ui.NavigationDrawerFragment;
import org.tasks.ui.PriorityControlSet;
import org.tasks.ui.RemoteListFragment;
diff --git a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
index 14717c136..eb2af00fd 100644
--- a/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
+++ b/app/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
@@ -8,13 +8,13 @@ import android.os.Bundle;
import android.preference.Preference;
import android.preference.PreferenceCategory;
import android.preference.PreferenceGroup;
-import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.Toolbar;
-import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.LinearLayout;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar.OnMenuItemClickListener;
+import androidx.core.content.ContextCompat;
import com.jakewharton.processphoenix.ProcessPhoenix;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.api.Filter;
@@ -70,7 +70,8 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct
Timber.e(e);
toolbar.setTitle(getTitle());
}
- toolbar.setNavigationIcon(ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px));
+ toolbar.setNavigationIcon(
+ ContextCompat.getDrawable(this, R.drawable.ic_outline_arrow_back_24px));
toolbar.setNavigationOnClickListener(v -> finish());
toolbar.inflateMenu(R.menu.menu_preferences);
toolbar.setOnMenuItemClickListener(this);
diff --git a/app/src/main/java/org/tasks/jobs/AfterSaveWork.java b/app/src/main/java/org/tasks/jobs/AfterSaveWork.java
index 021ea7ba7..ef584fa09 100644
--- a/app/src/main/java/org/tasks/jobs/AfterSaveWork.java
+++ b/app/src/main/java/org/tasks/jobs/AfterSaveWork.java
@@ -50,6 +50,10 @@ public class AfterSaveWork extends InjectingWorker {
@Inject SyncAdapters syncAdapters;
@Inject WorkManager workManager;
+ public AfterSaveWork(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+ super(context, workerParams);
+ }
+
static Data getInputData(Task current, Task original) {
boolean suppress = current.checkTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC);
boolean force = current.checkTransitory(SyncFlags.FORCE_SYNC);
@@ -68,10 +72,6 @@ public class AfterSaveWork extends InjectingWorker {
return builder.build();
}
- public AfterSaveWork(@NonNull Context context, @NonNull WorkerParameters workerParams) {
- super(context, workerParams);
- }
-
@Override
protected Result run() {
Data data = getInputData();
diff --git a/app/src/main/java/org/tasks/jobs/BackupWork.java b/app/src/main/java/org/tasks/jobs/BackupWork.java
index e49550fc9..912d3cbd6 100644
--- a/app/src/main/java/org/tasks/jobs/BackupWork.java
+++ b/app/src/main/java/org/tasks/jobs/BackupWork.java
@@ -1,39 +1,35 @@
package org.tasks.jobs;
+import static com.google.common.collect.Iterables.filter;
+import static com.google.common.collect.Iterables.skip;
+import static com.google.common.collect.Lists.newArrayList;
+import static com.todoroo.andlib.utility.DateUtilities.now;
+import static java.util.Collections.emptyList;
+
import android.content.Context;
import android.net.Uri;
-
+import androidx.annotation.NonNull;
+import androidx.documentfile.provider.DocumentFile;
+import androidx.work.WorkerParameters;
import com.google.common.base.Predicate;
-
-import org.tasks.R;
-import org.tasks.backup.TasksJsonExporter;
-import org.tasks.drive.DriveInvoker;
-import org.tasks.injection.ForApplication;
-import org.tasks.injection.JobComponent;
-import org.tasks.preferences.Preferences;
-
import java.io.File;
import java.io.FileFilter;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-
import javax.inject.Inject;
-
-import androidx.annotation.NonNull;
-import androidx.documentfile.provider.DocumentFile;
-import androidx.work.WorkerParameters;
+import org.tasks.R;
+import org.tasks.backup.TasksJsonExporter;
+import org.tasks.drive.DriveInvoker;
+import org.tasks.injection.ForApplication;
+import org.tasks.injection.JobComponent;
+import org.tasks.preferences.Preferences;
import timber.log.Timber;
-import static com.google.common.collect.Iterables.filter;
-import static com.google.common.collect.Iterables.skip;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.todoroo.andlib.utility.DateUtilities.now;
-import static java.util.Collections.emptyList;
-
public class BackupWork extends RepeatingWorker {
+ public static final int DAYS_TO_KEEP_BACKUP = 7;
static final String BACKUP_FILE_NAME_REGEX = "auto\\.[-\\d]+\\.json";
static final Predicate See the file "LICENSE" for the full license governing this code.
*/
+
package org.tasks.sync;
import static java.util.Arrays.asList;
diff --git a/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java b/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java
index fd4105f4f..16d5e46f4 100644
--- a/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java
+++ b/app/src/main/java/org/tasks/tasklist/ActionModeProvider.java
@@ -4,10 +4,10 @@ import static com.todoroo.astrid.activity.TaskListFragment.REQUEST_MOVE_TASKS;
import static org.tasks.activities.RemoteListSupportPicker.newRemoteListSupportPicker;
import android.content.Context;
-import androidx.appcompat.view.ActionMode;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
+import androidx.appcompat.view.ActionMode;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.TaskAdapter;
diff --git a/app/src/main/java/org/tasks/tasklist/ActionUtils.java b/app/src/main/java/org/tasks/tasklist/ActionUtils.java
index 82e07e096..b5f42f3af 100644
--- a/app/src/main/java/org/tasks/tasklist/ActionUtils.java
+++ b/app/src/main/java/org/tasks/tasklist/ActionUtils.java
@@ -1,11 +1,11 @@
package org.tasks.tasklist;
-import androidx.appcompat.app.WindowDecorActionBar;
-import androidx.appcompat.view.StandaloneActionMode;
-import androidx.appcompat.widget.ActionBarContextView;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;
+import androidx.appcompat.app.WindowDecorActionBar;
+import androidx.appcompat.view.StandaloneActionMode;
+import androidx.appcompat.widget.ActionBarContextView;
import java.lang.reflect.Field;
import org.tasks.R;
import org.tasks.themes.ThemeColor;
diff --git a/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java b/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java
index c1d6e3c70..51c7c8933 100644
--- a/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java
+++ b/app/src/main/java/org/tasks/tasklist/GtasksListFragment.java
@@ -4,8 +4,8 @@ import static android.app.Activity.RESULT_OK;
import android.content.Intent;
import android.os.Bundle;
-import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
+import androidx.appcompat.widget.Toolbar;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.Filter;
diff --git a/app/src/main/java/org/tasks/tasklist/ItemTouchHelperCallback.java b/app/src/main/java/org/tasks/tasklist/ItemTouchHelperCallback.java
index fdb52e6ea..663e95de7 100644
--- a/app/src/main/java/org/tasks/tasklist/ItemTouchHelperCallback.java
+++ b/app/src/main/java/org/tasks/tasklist/ItemTouchHelperCallback.java
@@ -4,8 +4,8 @@ import static androidx.recyclerview.widget.ItemTouchHelper.DOWN;
import static androidx.recyclerview.widget.ItemTouchHelper.UP;
import android.graphics.Canvas;
-import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.adapter.TaskAdapter;
import com.todoroo.astrid.utility.Flags;
diff --git a/app/src/main/java/org/tasks/tasklist/TagListFragment.java b/app/src/main/java/org/tasks/tasklist/TagListFragment.java
index fe42192f7..7d28c5ad9 100644
--- a/app/src/main/java/org/tasks/tasklist/TagListFragment.java
+++ b/app/src/main/java/org/tasks/tasklist/TagListFragment.java
@@ -3,8 +3,8 @@ package org.tasks.tasklist;
import android.app.Activity;
import android.content.Intent;
import android.os.Bundle;
-import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
+import androidx.appcompat.widget.Toolbar;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
import com.todoroo.astrid.api.Filter;
diff --git a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
index 4cd79fe69..84d0b1b90 100644
--- a/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
+++ b/app/src/main/java/org/tasks/tasklist/TaskListRecyclerAdapter.java
@@ -1,14 +1,14 @@
package org.tasks.tasklist;
+import android.os.Bundle;
+import android.view.ViewGroup;
+import androidx.appcompat.view.ActionMode;
import androidx.paging.AsyncPagedListDiffer;
import androidx.paging.PagedList;
-import android.os.Bundle;
import androidx.recyclerview.widget.AsyncDifferConfig;
+import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.ListUpdateCallback;
-import androidx.appcompat.view.ActionMode;
import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
-import android.view.ViewGroup;
import com.google.common.primitives.Longs;
import com.todoroo.astrid.activity.MainActivity;
import com.todoroo.astrid.activity.TaskListFragment;
diff --git a/app/src/main/java/org/tasks/tasklist/ViewHolder.java b/app/src/main/java/org/tasks/tasklist/ViewHolder.java
index 9ccc9a82c..98b5a750d 100644
--- a/app/src/main/java/org/tasks/tasklist/ViewHolder.java
+++ b/app/src/main/java/org/tasks/tasklist/ViewHolder.java
@@ -155,15 +155,15 @@ class ViewHolder extends RecyclerView.ViewHolder {
}
}
+ boolean isMoving() {
+ return moving;
+ }
+
void setMoving(boolean moving) {
this.moving = moving;
updateBackground();
}
- boolean isMoving() {
- return moving;
- }
-
private void updateBackground() {
if (selected || moving) {
rowBody.setBackgroundColor(selectedColor);
diff --git a/app/src/main/java/org/tasks/themes/Theme.java b/app/src/main/java/org/tasks/themes/Theme.java
index ff31c7d17..59bc36f4c 100644
--- a/app/src/main/java/org/tasks/themes/Theme.java
+++ b/app/src/main/java/org/tasks/themes/Theme.java
@@ -4,9 +4,9 @@ import android.app.Activity;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.PixelFormat;
-import androidx.appcompat.app.AppCompatDelegate;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
+import androidx.appcompat.app.AppCompatDelegate;
import javax.inject.Inject;
import org.tasks.R;
diff --git a/app/src/main/java/org/tasks/themes/ThemeBase.java b/app/src/main/java/org/tasks/themes/ThemeBase.java
index 3efe847da..3e989ff82 100644
--- a/app/src/main/java/org/tasks/themes/ThemeBase.java
+++ b/app/src/main/java/org/tasks/themes/ThemeBase.java
@@ -4,8 +4,8 @@ import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.os.Parcel;
-import androidx.appcompat.app.AppCompatDelegate;
import android.view.ContextThemeWrapper;
+import androidx.appcompat.app.AppCompatDelegate;
import org.tasks.R;
import org.tasks.dialogs.ColorPickerDialog;
diff --git a/app/src/main/java/org/tasks/themes/ThemeCache.java b/app/src/main/java/org/tasks/themes/ThemeCache.java
index 2e683cf84..a15373143 100644
--- a/app/src/main/java/org/tasks/themes/ThemeCache.java
+++ b/app/src/main/java/org/tasks/themes/ThemeCache.java
@@ -5,9 +5,9 @@ import static com.google.common.collect.ImmutableList.copyOf;
import android.content.Context;
import android.content.res.Resources;
-import androidx.appcompat.app.AppCompatDelegate;
import android.util.TypedValue;
import android.view.ContextThemeWrapper;
+import androidx.appcompat.app.AppCompatDelegate;
import java.util.ArrayList;
import java.util.List;
import javax.inject.Inject;
diff --git a/app/src/main/java/org/tasks/themes/ThemeColor.java b/app/src/main/java/org/tasks/themes/ThemeColor.java
index 4f208d4a0..7dafd8da0 100644
--- a/app/src/main/java/org/tasks/themes/ThemeColor.java
+++ b/app/src/main/java/org/tasks/themes/ThemeColor.java
@@ -12,9 +12,9 @@ import android.content.res.Resources;
import android.os.Build;
import android.os.Build.VERSION_CODES;
import android.os.Parcel;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.appcompat.widget.Toolbar;
import android.view.View;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
import org.tasks.R;
import org.tasks.dialogs.ColorPickerDialog;
import org.tasks.ui.MenuColorizer;
diff --git a/app/src/main/java/org/tasks/time/DateTimeUtils.java b/app/src/main/java/org/tasks/time/DateTimeUtils.java
index e786b3a0e..6206fbea9 100644
--- a/app/src/main/java/org/tasks/time/DateTimeUtils.java
+++ b/app/src/main/java/org/tasks/time/DateTimeUtils.java
@@ -1,8 +1,7 @@
package org.tasks.time;
-import org.tasks.BuildConfig;
-
import java.util.Date;
+import org.tasks.BuildConfig;
public class DateTimeUtils {
diff --git a/app/src/main/java/org/tasks/ui/CalendarControlSet.java b/app/src/main/java/org/tasks/ui/CalendarControlSet.java
index e42a557d4..88a8370dd 100644
--- a/app/src/main/java/org/tasks/ui/CalendarControlSet.java
+++ b/app/src/main/java/org/tasks/ui/CalendarControlSet.java
@@ -12,13 +12,13 @@ import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
import android.provider.CalendarContract;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import butterknife.BindView;
import butterknife.OnClick;
import com.google.common.base.Strings;
diff --git a/app/src/main/java/org/tasks/ui/ChipProvider.java b/app/src/main/java/org/tasks/ui/ChipProvider.java
index 944f08a71..08470205d 100644
--- a/app/src/main/java/org/tasks/ui/ChipProvider.java
+++ b/app/src/main/java/org/tasks/ui/ChipProvider.java
@@ -86,7 +86,8 @@ public class ChipProvider {
chips.add(newChip(caldavFilter));
}
}
- Iterable