From 33d3683ae2fcccedb2b34ccb253b6cbe7cf2ac76 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Fri, 22 Jan 2021 22:58:09 +0530 Subject: Codestyle churn (#1283) * editorconfig: delete Signed-off-by: Harsh Shandilya * idea: adjust codestyle Signed-off-by: Harsh Shandilya * all: reformat with simplified import ordering rules Signed-off-by: Harsh Shandilya --- .../main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/git/base') diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt index e5737227..661aab5d 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt @@ -13,7 +13,9 @@ import com.github.michaelbull.result.andThen import com.github.michaelbull.result.mapError import com.google.android.material.dialog.MaterialAlertDialogBuilder import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.settings.GitSettings +import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs +import dev.msfjarvis.aps.util.extensions.sharedPrefs +import dev.msfjarvis.aps.util.git.ErrorMessages import dev.msfjarvis.aps.util.git.operation.BreakOutOfDetached import dev.msfjarvis.aps.util.git.operation.CloneOperation import dev.msfjarvis.aps.util.git.operation.PullOperation @@ -21,10 +23,8 @@ import dev.msfjarvis.aps.util.git.operation.PushOperation import dev.msfjarvis.aps.util.git.operation.ResetToRemoteOperation import dev.msfjarvis.aps.util.git.operation.SyncOperation import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity +import dev.msfjarvis.aps.util.settings.GitSettings import dev.msfjarvis.aps.util.settings.PreferenceKeys -import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.git.ErrorMessages import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import net.schmizz.sshj.common.DisconnectReason -- cgit v1.2.3