From 8af40c3fd3c7c90adf98c6bacb3f36e08884ae98 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Fri, 2 Nov 2018 14:49:23 +0100 Subject: [PATCH] Fix sportless issues --- app/build.gradle | 2 ++ .../com/github/gotify/MissedMessageUtil.java | 1 - .../github/gotify/NotificationSupport.java | 4 +--- .../main/java/com/github/gotify/Settings.java | 1 - .../main/java/com/github/gotify/Utils.java | 2 -- .../main/java/com/github/gotify/api/Api.java | 2 -- .../java/com/github/gotify/api/Callback.java | 1 - .../gotify/init/InitializationActivity.java | 8 +++---- .../java/com/github/gotify/log/Format.java | 2 -- .../main/java/com/github/gotify/log/Log.java | 2 -- .../com/github/gotify/log/LogsActivity.java | 4 +--- .../github/gotify/login/LoginActivity.java | 14 ++++++------- .../gotify/messages/ListMessageAdapter.java | 9 +++----- .../gotify/messages/MessagesActivity.java | 21 ++++++++----------- .../messages/provider/ApplicationHolder.java | 2 -- .../messages/provider/MessageFacade.java | 1 - .../provider/MessageImageCombiner.java | 1 - .../messages/provider/MessageState.java | 1 - .../messages/provider/MessageStateHolder.java | 1 - .../gotify/service/WebSocketConnection.java | 3 --- .../gotify/service/WebSocketService.java | 9 +++----- 21 files changed, 28 insertions(+), 63 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 02194ec..0fd0995 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -51,5 +51,7 @@ spotless { java { target '**/*.java' googleJavaFormat().aosp() + removeUnusedImports() + importOrder('', 'static *') } } diff --git a/app/src/main/java/com/github/gotify/MissedMessageUtil.java b/app/src/main/java/com/github/gotify/MissedMessageUtil.java index 621b884..29b1eca 100644 --- a/app/src/main/java/com/github/gotify/MissedMessageUtil.java +++ b/app/src/main/java/com/github/gotify/MissedMessageUtil.java @@ -8,7 +8,6 @@ import com.github.gotify.client.api.MessageApi; import com.github.gotify.client.model.Message; import com.github.gotify.client.model.PagedMessages; import com.github.gotify.log.Log; - import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/github/gotify/NotificationSupport.java b/app/src/main/java/com/github/gotify/NotificationSupport.java index d27f604..47d709f 100644 --- a/app/src/main/java/com/github/gotify/NotificationSupport.java +++ b/app/src/main/java/com/github/gotify/NotificationSupport.java @@ -3,10 +3,8 @@ package com.github.gotify; import android.app.NotificationChannel; import android.app.NotificationManager; import android.os.Build; - -import com.github.gotify.log.Log; - import androidx.annotation.RequiresApi; +import com.github.gotify.log.Log; public class NotificationSupport { public static final class Group { diff --git a/app/src/main/java/com/github/gotify/Settings.java b/app/src/main/java/com/github/gotify/Settings.java index a52a0b3..86726c8 100644 --- a/app/src/main/java/com/github/gotify/Settings.java +++ b/app/src/main/java/com/github/gotify/Settings.java @@ -2,7 +2,6 @@ package com.github.gotify; import android.content.Context; import android.content.SharedPreferences; - import com.github.gotify.client.model.User; public class Settings { diff --git a/app/src/main/java/com/github/gotify/Utils.java b/app/src/main/java/com/github/gotify/Utils.java index ed1d7ba..7cc8e1f 100644 --- a/app/src/main/java/com/github/gotify/Utils.java +++ b/app/src/main/java/com/github/gotify/Utils.java @@ -7,14 +7,12 @@ import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; import android.text.format.DateUtils; import android.view.View; - import com.github.gotify.client.ApiClient; import com.github.gotify.client.JSON; import com.github.gotify.log.Log; import com.google.android.material.snackbar.Snackbar; import com.squareup.picasso.Picasso; import com.squareup.picasso.Target; - import org.threeten.bp.OffsetDateTime; public class Utils { diff --git a/app/src/main/java/com/github/gotify/api/Api.java b/app/src/main/java/com/github/gotify/api/Api.java index 474ada2..23b4e9a 100644 --- a/app/src/main/java/com/github/gotify/api/Api.java +++ b/app/src/main/java/com/github/gotify/api/Api.java @@ -1,11 +1,9 @@ package com.github.gotify.api; import android.app.Activity; - import com.github.gotify.client.ApiCallback; import com.github.gotify.client.ApiException; import com.github.gotify.log.Log; - import java.util.List; import java.util.Map; diff --git a/app/src/main/java/com/github/gotify/api/Callback.java b/app/src/main/java/com/github/gotify/api/Callback.java index 65e9a7c..1eee04e 100644 --- a/app/src/main/java/com/github/gotify/api/Callback.java +++ b/app/src/main/java/com/github/gotify/api/Callback.java @@ -1,7 +1,6 @@ package com.github.gotify.api; import android.app.Activity; - import com.github.gotify.client.ApiException; public class Callback { diff --git a/app/src/main/java/com/github/gotify/init/InitializationActivity.java b/app/src/main/java/com/github/gotify/init/InitializationActivity.java index 7acaa70..f69f5ad 100644 --- a/app/src/main/java/com/github/gotify/init/InitializationActivity.java +++ b/app/src/main/java/com/github/gotify/init/InitializationActivity.java @@ -5,7 +5,9 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.Bundle; - +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import com.github.gotify.NotificationSupport; import com.github.gotify.R; import com.github.gotify.Settings; @@ -22,10 +24,6 @@ import com.github.gotify.login.LoginActivity; import com.github.gotify.messages.MessagesActivity; import com.github.gotify.service.WebSocketService; -import androidx.annotation.Nullable; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; - public class InitializationActivity extends AppCompatActivity { private Settings settings; diff --git a/app/src/main/java/com/github/gotify/log/Format.java b/app/src/main/java/com/github/gotify/log/Format.java index e9d825f..c8f055c 100644 --- a/app/src/main/java/com/github/gotify/log/Format.java +++ b/app/src/main/java/com/github/gotify/log/Format.java @@ -1,9 +1,7 @@ package com.github.gotify.log; import android.content.Context; - import com.hypertrack.hyperlog.LogFormat; - import java.util.Locale; public class Format extends LogFormat { diff --git a/app/src/main/java/com/github/gotify/log/Log.java b/app/src/main/java/com/github/gotify/log/Log.java index 305d651..acb7b6e 100644 --- a/app/src/main/java/com/github/gotify/log/Log.java +++ b/app/src/main/java/com/github/gotify/log/Log.java @@ -2,9 +2,7 @@ package com.github.gotify.log; import android.content.Context; import android.text.TextUtils; - import com.hypertrack.hyperlog.HyperLog; - import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/github/gotify/log/LogsActivity.java b/app/src/main/java/com/github/gotify/log/LogsActivity.java index 4335a71..c66dd1d 100644 --- a/app/src/main/java/com/github/gotify/log/LogsActivity.java +++ b/app/src/main/java/com/github/gotify/log/LogsActivity.java @@ -6,11 +6,9 @@ import android.os.Handler; import android.view.Menu; import android.view.MenuItem; import android.widget.TextView; - -import com.github.gotify.R; - import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import com.github.gotify.R; public class LogsActivity extends AppCompatActivity { diff --git a/app/src/main/java/com/github/gotify/login/LoginActivity.java b/app/src/main/java/com/github/gotify/login/LoginActivity.java index 469581a..ad866e3 100644 --- a/app/src/main/java/com/github/gotify/login/LoginActivity.java +++ b/app/src/main/java/com/github/gotify/login/LoginActivity.java @@ -8,7 +8,12 @@ import android.view.View; import android.widget.Button; import android.widget.EditText; import android.widget.ProgressBar; - +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import butterknife.BindView; +import butterknife.ButterKnife; +import butterknife.OnClick; +import butterknife.OnTextChanged; import com.github.gotify.R; import com.github.gotify.Settings; import com.github.gotify.Utils; @@ -26,13 +31,6 @@ import com.github.gotify.log.Log; import com.github.gotify.log.UncaughtExceptionHandler; import com.squareup.okhttp.HttpUrl; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import butterknife.BindView; -import butterknife.ButterKnife; -import butterknife.OnClick; -import butterknife.OnTextChanged; - public class LoginActivity extends AppCompatActivity { @BindView(R.id.username) diff --git a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java index 8bc7676..87c2934 100644 --- a/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java +++ b/app/src/main/java/com/github/gotify/messages/ListMessageAdapter.java @@ -8,19 +8,16 @@ import android.widget.BaseAdapter; import android.widget.ImageButton; import android.widget.ImageView; import android.widget.TextView; - +import androidx.recyclerview.widget.RecyclerView; +import butterknife.BindView; +import butterknife.ButterKnife; import com.github.gotify.R; import com.github.gotify.Utils; import com.github.gotify.client.model.Message; import com.github.gotify.messages.provider.MessageWithImage; import com.squareup.picasso.Picasso; - import java.util.List; -import androidx.recyclerview.widget.RecyclerView; -import butterknife.BindView; -import butterknife.ButterKnife; - public class ListMessageAdapter extends BaseAdapter { private Context content; diff --git a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java index 137cd02..dcbe10a 100644 --- a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java +++ b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java @@ -14,7 +14,15 @@ import android.widget.AbsListView; import android.widget.ImageButton; import android.widget.ListView; import android.widget.TextView; - +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import butterknife.BindView; +import butterknife.ButterKnife; import com.github.gotify.MissedMessageUtil; import com.github.gotify.R; import com.github.gotify.Settings; @@ -40,21 +48,10 @@ import com.google.android.material.navigation.NavigationView; import com.squareup.okhttp.HttpUrl; import com.squareup.picasso.Picasso; import com.squareup.picasso.Target; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import androidx.appcompat.app.ActionBarDrawerToggle; -import androidx.appcompat.app.AlertDialog; -import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; -import androidx.core.view.GravityCompat; -import androidx.drawerlayout.widget.DrawerLayout; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import butterknife.BindView; -import butterknife.ButterKnife; - import static java.util.Collections.emptyList; public class MessagesActivity extends AppCompatActivity diff --git a/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java b/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java index 697292a..8d3b97c 100644 --- a/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java +++ b/app/src/main/java/com/github/gotify/messages/provider/ApplicationHolder.java @@ -1,14 +1,12 @@ package com.github.gotify.messages.provider; import android.app.Activity; - import com.github.gotify.Utils; import com.github.gotify.api.Api; import com.github.gotify.client.ApiClient; import com.github.gotify.client.ApiException; import com.github.gotify.client.api.TokenApi; import com.github.gotify.client.model.Application; - import java.util.Collections; import java.util.List; diff --git a/app/src/main/java/com/github/gotify/messages/provider/MessageFacade.java b/app/src/main/java/com/github/gotify/messages/provider/MessageFacade.java index 30873d3..9356c9f 100644 --- a/app/src/main/java/com/github/gotify/messages/provider/MessageFacade.java +++ b/app/src/main/java/com/github/gotify/messages/provider/MessageFacade.java @@ -3,7 +3,6 @@ package com.github.gotify.messages.provider; import com.github.gotify.client.api.MessageApi; import com.github.gotify.client.model.Message; import com.github.gotify.client.model.PagedMessages; - import java.util.List; public class MessageFacade { diff --git a/app/src/main/java/com/github/gotify/messages/provider/MessageImageCombiner.java b/app/src/main/java/com/github/gotify/messages/provider/MessageImageCombiner.java index b6fa9f7..4a145f6 100644 --- a/app/src/main/java/com/github/gotify/messages/provider/MessageImageCombiner.java +++ b/app/src/main/java/com/github/gotify/messages/provider/MessageImageCombiner.java @@ -2,7 +2,6 @@ package com.github.gotify.messages.provider; import com.github.gotify.client.model.Application; import com.github.gotify.client.model.Message; - import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/app/src/main/java/com/github/gotify/messages/provider/MessageState.java b/app/src/main/java/com/github/gotify/messages/provider/MessageState.java index 607d5ae..8c8db1e 100644 --- a/app/src/main/java/com/github/gotify/messages/provider/MessageState.java +++ b/app/src/main/java/com/github/gotify/messages/provider/MessageState.java @@ -1,7 +1,6 @@ package com.github.gotify.messages.provider; import com.github.gotify.client.model.Message; - import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/com/github/gotify/messages/provider/MessageStateHolder.java b/app/src/main/java/com/github/gotify/messages/provider/MessageStateHolder.java index 348761d..0f55164 100644 --- a/app/src/main/java/com/github/gotify/messages/provider/MessageStateHolder.java +++ b/app/src/main/java/com/github/gotify/messages/provider/MessageStateHolder.java @@ -2,7 +2,6 @@ package com.github.gotify.messages.provider; import com.github.gotify.client.model.Message; import com.github.gotify.client.model.PagedMessages; - import java.util.HashMap; import java.util.Map; diff --git a/app/src/main/java/com/github/gotify/service/WebSocketConnection.java b/app/src/main/java/com/github/gotify/service/WebSocketConnection.java index d5c802a..c6914fb 100644 --- a/app/src/main/java/com/github/gotify/service/WebSocketConnection.java +++ b/app/src/main/java/com/github/gotify/service/WebSocketConnection.java @@ -1,15 +1,12 @@ package com.github.gotify.service; import android.os.Handler; - import com.github.gotify.Utils; import com.github.gotify.api.Callback; import com.github.gotify.client.JSON; import com.github.gotify.client.model.Message; import com.github.gotify.log.Log; - import java.util.concurrent.TimeUnit; - import okhttp3.HttpUrl; import okhttp3.OkHttpClient; import okhttp3.Request; diff --git a/app/src/main/java/com/github/gotify/service/WebSocketService.java b/app/src/main/java/com/github/gotify/service/WebSocketService.java index ee26621..ab5777d 100644 --- a/app/src/main/java/com/github/gotify/service/WebSocketService.java +++ b/app/src/main/java/com/github/gotify/service/WebSocketService.java @@ -8,7 +8,9 @@ import android.content.Context; import android.content.Intent; import android.os.Build; import android.os.IBinder; - +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; +import androidx.core.app.NotificationCompat; import com.github.gotify.MissedMessageUtil; import com.github.gotify.NotificationSupport; import com.github.gotify.R; @@ -19,14 +21,9 @@ import com.github.gotify.client.model.Message; import com.github.gotify.log.Log; import com.github.gotify.log.UncaughtExceptionHandler; import com.github.gotify.messages.MessagesActivity; - import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; -import androidx.core.app.NotificationCompat; - public class WebSocketService extends Service { public static final String NEW_MESSAGE_BROADCAST =