From 76f8f49cdf0aff2ea9d7867a6ee8523f5f380a3a Mon Sep 17 00:00:00 2001 From: M M Arif Date: Thu, 28 Mar 2024 17:02:17 +0500 Subject: [PATCH] Code improvements --- .../org/mian/gitnex/helpers/FileDiffView.java | 2 +- .../org/mian/gitnex/helpers/Markdown.java | 2 - .../helpers/MergePullRequestSpinner.java | 3 +- .../org/mian/gitnex/helpers/PicassoCache.java | 5 +-- .../org/mian/gitnex/helpers/UrlHelper.java | 4 +- .../java/org/mian/gitnex/helpers/Version.java | 38 +++++++++---------- .../helpers/attachments/AttachmentUtils.java | 8 ++-- .../codeeditor/SourcePositionListener.java | 3 +- .../LanguageStatisticsBar.java | 2 +- .../viewmodels/AdminGetUsersViewModel.java | 2 +- .../gitnex/viewmodels/DashboardViewModel.java | 2 +- .../viewmodels/IssueCommentsViewModel.java | 2 +- .../gitnex/viewmodels/IssuesViewModel.java | 2 +- .../viewmodels/MembersByOrgViewModel.java | 2 +- .../viewmodels/MilestonesViewModel.java | 2 +- .../viewmodels/OrganizationsViewModel.java | 2 +- .../viewmodels/RepoWatchersViewModel.java | 2 +- .../viewmodels/RepositoriesViewModel.java | 2 +- .../viewmodels/RepositoryForksViewModel.java | 2 +- .../mian/gitnex/viewmodels/WikiViewModel.java | 2 +- .../org/mian/gitnex/views/ReactionList.java | 7 +++- .../gitnex/views/SyntaxHighlightedArea.java | 2 +- 22 files changed, 51 insertions(+), 47 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java b/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java index f07a3947..ab69ef98 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java +++ b/app/src/main/java/org/mian/gitnex/helpers/FileDiffView.java @@ -41,7 +41,7 @@ public class FileDiffView implements Serializable { public String getFileName() { - if (fileOldName.length() != 0 && !fileOldName.equals(fileNewName)) { + if (!fileOldName.isEmpty() && !fileOldName.equals(fileNewName)) { return fileOldName + " -> " + fileNewName; } return fileNewName; diff --git a/app/src/main/java/org/mian/gitnex/helpers/Markdown.java b/app/src/main/java/org/mian/gitnex/helpers/Markdown.java index 2b57233e..6729e945 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/Markdown.java +++ b/app/src/main/java/org/mian/gitnex/helpers/Markdown.java @@ -170,7 +170,6 @@ public class Markdown { private Context context; private String markdown; private TextView textView; - TinyDB tinyDB = TinyDB.getInstance(null); public Renderer(Slot slot) { @@ -320,7 +319,6 @@ public class Markdown { private RecyclerView recyclerView; private MarkwonAdapter adapter; private RepositoryContext repository; - TinyDB tinyDB = TinyDB.getInstance(null); private LinkPostProcessor linkPostProcessor; diff --git a/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java b/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java index a400a8a9..8875dbf5 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java +++ b/app/src/main/java/org/mian/gitnex/helpers/MergePullRequestSpinner.java @@ -1,5 +1,6 @@ package org.mian.gitnex.helpers; +import androidx.annotation.NonNull; import java.io.Serializable; /** @@ -31,7 +32,7 @@ public class MergePullRequestSpinner implements Serializable { this.mergerMethod = mergerMethod; } - @Override + @NonNull @Override public String toString() { return mergerMethod; } diff --git a/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java b/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java index 2412cb2a..43e528ef 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java +++ b/app/src/main/java/org/mian/gitnex/helpers/PicassoCache.java @@ -29,7 +29,6 @@ public class PicassoCache implements Cache { private final int CACHE_SIZE; private final File cachePath; private final HashMap cacheMap; - private final Context ctx; public PicassoCache(File cachePath, Context ctx) throws IOException, ClassNotFoundException { @@ -41,7 +40,6 @@ public class PicassoCache implements Cache { * 1024; this.cachePath = cachePath; cacheMap = new HashMap<>(); - this.ctx = ctx; if (cacheMapExists(cachePath)) { @@ -104,7 +102,8 @@ public class PicassoCache implements Cache { for (String key : cacheMap.keySet()) { - currentSize += new File(cachePath, Objects.requireNonNull(cacheMap.get(key))).length(); + currentSize += + (int) new File(cachePath, Objects.requireNonNull(cacheMap.get(key))).length(); } return currentSize; diff --git a/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java b/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java index e1010f62..ab6f8517 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java +++ b/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java @@ -1,7 +1,9 @@ package org.mian.gitnex.helpers; +import android.util.Log; import java.net.URI; import java.net.URISyntaxException; +import java.util.Objects; /** * @author M M Arif @@ -14,7 +16,7 @@ public class UrlHelper { try { uri = new URI(url); } catch (URISyntaxException e) { - e.printStackTrace(); + Log.e("UrlHelper", Objects.requireNonNull(e.getMessage())); } assert uri != null; diff --git a/app/src/main/java/org/mian/gitnex/helpers/Version.java b/app/src/main/java/org/mian/gitnex/helpers/Version.java index d52687f3..d6cf5128 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/Version.java +++ b/app/src/main/java/org/mian/gitnex/helpers/Version.java @@ -28,8 +28,8 @@ public class Version { /** * valid return true if string is a valid version * - * @param value - * @return + * @param value String + * @return true/false */ public static boolean valid(String value) { @@ -37,15 +37,13 @@ public class Version { return false; } final Pattern patternValid = - Pattern.compile("^[vV]?(\\d+)+(\\.(\\d+))*([_\\-+][\\w\\-+\\.]*)?$"); + Pattern.compile("^[vV]?(\\d+)+(\\.(\\d+))*([_\\-+][\\w\\-+.]*)?$"); return value.equals("main") || patternValid.matcher(value).find(); } /** * init parse and store values for other functions of an Version instance it use the raw * variable as base - * - * @return if parse was successfully */ private void init() { @@ -84,7 +82,7 @@ public class Version { /** * equal return true if version is the same * - * @param value + * @param value String * @return true/false */ public boolean equal(String value) { @@ -95,8 +93,8 @@ public class Version { /** * equal return true if version is the same * - * @param v - * @return + * @param v Version + * @return true/false */ public boolean equal(@NonNull Version v) { @@ -116,7 +114,7 @@ public class Version { /** * less return true if version is less * - * @param value + * @param value String * @return true/false */ public boolean less(String value) { @@ -127,8 +125,8 @@ public class Version { /** * less return true if version is less * - * @param v - * @return + * @param v Version + * @return true/false */ public boolean less(@NonNull Version v) { @@ -138,7 +136,7 @@ public class Version { /** * higher return true if version is higher * - * @param value + * @param value String * @return true/false */ public boolean higher(String value) { @@ -149,8 +147,8 @@ public class Version { /** * higher return true if version is higher * - * @param v - * @return + * @param v Version + * @return true/false */ public boolean higher(@NonNull Version v) { @@ -180,7 +178,7 @@ public class Version { /** * lessOrEqual return true if version is less or equal * - * @param value + * @param value String * @return true/false */ public boolean lessOrEqual(String value) { @@ -191,8 +189,8 @@ public class Version { /** * lessOrEqual return true if version is less or equal * - * @param v - * @return + * @param v Version + * @return true/false */ public boolean lessOrEqual(@NonNull Version v) { @@ -202,7 +200,7 @@ public class Version { /** * higherOrEqual return true if version is higher or equal * - * @param value + * @param value String * @return true/false */ public boolean higherOrEqual(String value) { @@ -213,8 +211,8 @@ public class Version { /** * higherOrEqual return true if version is higher or equal * - * @param v - * @return + * @param v Version + * @return true/false */ public boolean higherOrEqual(@NonNull Version v) { diff --git a/app/src/main/java/org/mian/gitnex/helpers/attachments/AttachmentUtils.java b/app/src/main/java/org/mian/gitnex/helpers/attachments/AttachmentUtils.java index 70aff4a2..cf359354 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/attachments/AttachmentUtils.java +++ b/app/src/main/java/org/mian/gitnex/helpers/attachments/AttachmentUtils.java @@ -4,10 +4,12 @@ import android.content.Context; import android.database.Cursor; import android.net.Uri; import android.provider.OpenableColumns; +import android.util.Log; import java.io.File; import java.io.FileOutputStream; import java.io.InputStream; import java.io.OutputStream; +import java.util.Objects; /** * @author M M Arif @@ -22,13 +24,13 @@ public class AttachmentUtils { new File( ctx.getFilesDir().getPath() + File.separatorChar + queryName(ctx, uri)); } catch (AssertionError e) { - destinationFilename = new File(uri.getPath()); + destinationFilename = new File(Objects.requireNonNull(uri.getPath())); } try (InputStream ins = ctx.getContentResolver().openInputStream(uri)) { createFileFromStream(ins, destinationFilename); } catch (Exception ex) { - ex.printStackTrace(); + Log.e("AttachmentUtils", Objects.requireNonNull(ex.getMessage())); } return destinationFilename; } @@ -54,7 +56,7 @@ public class AttachmentUtils { } os.flush(); } catch (Exception ex) { - ex.printStackTrace(); + Log.e("AttachmentUtils", Objects.requireNonNull(ex.getMessage())); } } } diff --git a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java index 0e761770..4f7d4068 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java +++ b/app/src/main/java/org/mian/gitnex/helpers/codeeditor/SourcePositionListener.java @@ -4,6 +4,7 @@ import android.text.Layout; import android.view.View; import android.view.accessibility.AccessibilityEvent; import android.widget.EditText; +import androidx.annotation.NonNull; /** * @author AmrDeveloper @@ -18,7 +19,7 @@ public class SourcePositionListener { new View.AccessibilityDelegate() { @Override - public void sendAccessibilityEvent(View host, int eventType) { + public void sendAccessibilityEvent(@NonNull View host, int eventType) { super.sendAccessibilityEvent(host, eventType); if (eventType == AccessibilityEvent.TYPE_VIEW_TEXT_SELECTION_CHANGED && onPositionChanged != null) { diff --git a/app/src/main/java/org/mian/gitnex/helpers/languagestatistics/LanguageStatisticsBar.java b/app/src/main/java/org/mian/gitnex/helpers/languagestatistics/LanguageStatisticsBar.java index 31c8b59e..ab054735 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/languagestatistics/LanguageStatisticsBar.java +++ b/app/src/main/java/org/mian/gitnex/helpers/languagestatistics/LanguageStatisticsBar.java @@ -38,7 +38,7 @@ public class LanguageStatisticsBar extends androidx.appcompat.widget.AppCompatSe protected void onDraw(Canvas canvas) { - if (progressItemsList.size() > 0) { + if (!progressItemsList.isEmpty()) { int progressBarWidth = getWidth(); int progressBarHeight = getHeight(); diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java index a81db168..49bcae6d 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/AdminGetUsersViewModel.java @@ -77,7 +77,7 @@ public class AdminGetUsersViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/DashboardViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/DashboardViewModel.java index e5efd68b..17513f90 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/DashboardViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/DashboardViewModel.java @@ -91,7 +91,7 @@ public class DashboardViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java index 3a24eb7c..c69302aa 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssueCommentsViewModel.java @@ -101,7 +101,7 @@ public class IssueCommentsViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java index 9e33928d..60b97ecb 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/IssuesViewModel.java @@ -135,7 +135,7 @@ public class IssuesViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java index c1acd3fa..073e38cf 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/MembersByOrgViewModel.java @@ -50,7 +50,7 @@ public class MembersByOrgViewModel extends ViewModel { } @Override - public void onFailure(@NonNull Call> call, Throwable t) { + public void onFailure(@NonNull Call> call, @NonNull Throwable t) { Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError)); } diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java index afee3e2b..19b5a898 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/MilestonesViewModel.java @@ -92,7 +92,7 @@ public class MilestonesViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java index 306b03c5..9912603d 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/OrganizationsViewModel.java @@ -78,7 +78,7 @@ public class OrganizationsViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java index c0bc30eb..22375180 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/RepoWatchersViewModel.java @@ -51,7 +51,7 @@ public class RepoWatchersViewModel extends ViewModel { } @Override - public void onFailure(@NonNull Call> call, Throwable t) { + public void onFailure(@NonNull Call> call, @NonNull Throwable t) { Toasty.error(ctx, ctx.getString(R.string.genericServerResponseError)); } diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java index 67e65335..231eed22 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/RepositoriesViewModel.java @@ -157,7 +157,7 @@ public class RepositoriesViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/RepositoryForksViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/RepositoryForksViewModel.java index c1d6a617..e5ed30a7 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/RepositoryForksViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/RepositoryForksViewModel.java @@ -82,7 +82,7 @@ public class RepositoryForksViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java b/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java index c545c1be..fc5ca0ee 100644 --- a/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java +++ b/app/src/main/java/org/mian/gitnex/viewmodels/WikiViewModel.java @@ -116,7 +116,7 @@ public class WikiViewModel extends ViewModel { assert list != null; assert response.body() != null; - if (response.body().size() != 0) { + if (!response.body().isEmpty()) { list.addAll(response.body()); adapter.updateList(list); } else { diff --git a/app/src/main/java/org/mian/gitnex/views/ReactionList.java b/app/src/main/java/org/mian/gitnex/views/ReactionList.java index 3dea326f..5026c0f8 100644 --- a/app/src/main/java/org/mian/gitnex/views/ReactionList.java +++ b/app/src/main/java/org/mian/gitnex/views/ReactionList.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import org.gitnex.tea4j.v2.models.Reaction; import org.gitnex.tea4j.v2.models.User; @@ -108,8 +109,9 @@ public class ReactionList extends HorizontalScrollView { if (sortedReactions.containsKey( issueReaction.getContent())) { - sortedReactions - .get(issueReaction.getContent()) + Objects.requireNonNull( + sortedReactions.get( + issueReaction.getContent())) .add(issueReaction); } else { List issueReactions = new ArrayList<>(); @@ -135,6 +137,7 @@ public class ReactionList extends HorizontalScrollView { this, false); + assert issueReactions != null; for (Reaction issueReaction : issueReactions) { if (issueReaction .getUser() diff --git a/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java b/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java index 7350164a..fa2ad53a 100644 --- a/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java +++ b/app/src/main/java/org/mian/gitnex/views/SyntaxHighlightedArea.java @@ -100,7 +100,7 @@ public class SyntaxHighlightedArea extends LinearLayout { public void setContent(@NonNull String source, @NonNull String extension) { - if (source.length() > 0) { + if (!source.isEmpty()) { Thread highlightingThread = new Thread(