From 5af3f04d4db9867cb46b048ec4d020905e0b7764 Mon Sep 17 00:00:00 2001 From: Franze Jr Date: Sun, 8 Nov 2015 16:04:31 -0300 Subject: [PATCH] Remove unnecesary interface modifiers and redundant local variables --- Habitica/src/com/habitrpg/android/habitica/AboutActivity.java | 4 +--- Habitica/src/com/habitrpg/android/habitica/ContentCache.java | 4 +--- Habitica/src/com/habitrpg/android/habitica/LoginActivity.java | 2 +- .../android/habitica/callbacks/HabitRPGUserCallback.java | 4 ++-- .../android/habitica/callbacks/TaskScoringCallback.java | 4 ++-- .../habitrpg/android/habitica/userpicture/BitmapUtils.java | 3 +-- .../magicmicky/habitrpgwrapper/lib/models/TaskDirection.java | 2 +- 7 files changed, 9 insertions(+), 14 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java index e6ffc1aeb..cb7cb3a1a 100644 --- a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java @@ -105,7 +105,7 @@ public class AboutActivity extends AppCompatActivity { return new AboutFragment(); case 1: - Fragment tab1 = new LibsBuilder() + return new LibsBuilder() //Pass the fields of your application to the lib so it can find all external lib information .withFields(R.string.class.getFields()) .withActivityStyle(Libs.ActivityStyle.LIGHT_DARK_TOOLBAR) @@ -117,8 +117,6 @@ public class AboutActivity extends AppCompatActivity { .withAboutVersionShownName(true) .withAnimations(true) .fragment(); - - return tab1; case 2: PaperboyBuilder builder = new PaperboyBuilder(AboutActivity.this) .setViewType(ViewTypes.HEADER) diff --git a/Habitica/src/com/habitrpg/android/habitica/ContentCache.java b/Habitica/src/com/habitrpg/android/habitica/ContentCache.java index 717344546..82f5b0b27 100644 --- a/Habitica/src/com/habitrpg/android/habitica/ContentCache.java +++ b/Habitica/src/com/habitrpg/android/habitica/ContentCache.java @@ -41,9 +41,7 @@ public class ContentCache { final QuestContent quest = new Select().from(QuestContent.class).where(Condition.column("key").eq(key)).querySingle(); if (quest != null) { - QuestBoss boss = new Select().from(QuestBoss.class).where(Condition.column("key").eq(key)).querySingle(); - quest.boss = boss; - + quest.boss = new Select().from(QuestBoss.class).where(Condition.column("key").eq(key)).querySingle(); cb.GotQuest(quest); } else { diff --git a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java index b725657db..8b2710489 100644 --- a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java @@ -325,7 +325,7 @@ public class LoginActivity extends AppCompatActivity .putString(getString(R.string.SP_APIToken), key) .putString(getString(R.string.SP_userID), user) .commit(); - if (ans != true) { + if (!ans) { throw new Exception("PB_string_commit"); } startMainActivity(); diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java index 6dd4671a5..b0edf5059 100644 --- a/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java +++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/HabitRPGUserCallback.java @@ -38,8 +38,8 @@ public class HabitRPGUserCallback implements Callback { } public interface OnUserReceived { - public void onUserReceived(HabitRPGUser user); + void onUserReceived(HabitRPGUser user); - public void onUserFail(); + void onUserFail(); } } diff --git a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java index 857c56f4d..7ec0aee12 100644 --- a/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java +++ b/Habitica/src/com/habitrpg/android/habitica/callbacks/TaskScoringCallback.java @@ -41,8 +41,8 @@ public class TaskScoringCallback implements Callback { } public interface OnTaskScored { - public void onTaskDataReceived(TaskDirectionData data); + void onTaskDataReceived(TaskDirectionData data); - public void onTaskScoringFailed(); + void onTaskScoringFailed(); } } diff --git a/Habitica/src/com/habitrpg/android/habitica/userpicture/BitmapUtils.java b/Habitica/src/com/habitrpg/android/habitica/userpicture/BitmapUtils.java index 72c0fd179..628d1c83d 100644 --- a/Habitica/src/com/habitrpg/android/habitica/userpicture/BitmapUtils.java +++ b/Habitica/src/com/habitrpg/android/habitica/userpicture/BitmapUtils.java @@ -26,8 +26,7 @@ public class BitmapUtils { if (!f.exists()) { return null; } - Bitmap tmp = BitmapFactory.decodeFile(filename); - return tmp; + return BitmapFactory.decodeFile(filename); } catch (Exception e) { return null; } diff --git a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirection.java b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirection.java index 92f6caf93..0ae0cb54c 100644 --- a/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirection.java +++ b/Habitica/src/com/magicmicky/habitrpgwrapper/lib/models/TaskDirection.java @@ -7,7 +7,7 @@ public enum TaskDirection { up("up"), down("down"); private final String dir; - private TaskDirection(String dir) { + TaskDirection(String dir) { this.dir=dir; } public String toString() {