Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
Fix minor lint issues & remove dead code & make constants static
fattire00bfc4467682
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xmlindex ecab15b..f8a36e6 100644--- a/src/main/AndroidManifest.xml+++ b/src/main/AndroidManifest.xml@@ -41,7 +41,8 @@android:label="@string/app_name"android:largeHeap="true"android:theme="@style/AppTheme"- tools:replace="android:allowBackup">+ tools:replace="android:allowBackup"+ tools:ignore="GoogleAppIndexingWarning"><activityandroid:name=".ListActivity"android:configChanges="orientation|screenSize"diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex 61e49ce..0552150 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -60,18 +60,16 @@ import java.util.StringTokenizer;public class ListActivity extends AppCompatActivity {private RecyclerView recyclerView;- private FloatingActionButton fab;- private Toolbar toolbar;private EventAdapter adapter;private List<Event> events = new ArrayList<>();private PreferenceManager preferences;private int modifyPos = -1;- private int REQUEST_CODE_INTRO = 1001;+ private final static int REQUEST_CODE_INTRO = 1001;- private Handler handler = new Handler();+ final private Handler handler = new Handler();@Overrideprotected void onCreate(Bundle savedInstanceState) {@@ -81,8 +79,8 @@ public class ListActivity extends AppCompatActivity {preferences = new PreferenceManager(this.getApplicationContext());recyclerView = findViewById(R.id.main_list);- fab = findViewById(R.id.fab);- toolbar = findViewById(R.id.toolbar);+ FloatingActionButton fab = findViewById(R.id.fab);+ Toolbar toolbar = findViewById(R.id.toolbar);setSupportActionBar(toolbar);LinearLayoutManager llm = new LinearLayoutManager(this);@@ -313,7 +311,7 @@ public class ListActivity extends AppCompatActivity {private void removeAllEvents(){- final List<Event> removedEvents = new ArrayList<Event>();+ final List<Event> removedEvents = new ArrayList<>();final Runnable runnableDelete = new Runnable (){public void run ()diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex 93f7047..2c43a0e 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -49,7 +49,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedprivate PreferenceManager preferences;private HavenApp app;- private Activity mActivity;+ private AppCompatActivity mActivity;@Overridepublic void onCreatePreferencesFix(Bundle bundle, String s) {@@ -398,14 +398,14 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedpreferences.activateHeartbeat(true);findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(preferences.getHeartbeatNotificationTimeMs() / 60000 + " " + getString(R.string.minutes));if (preferences.getMonitorServiceActive()) {- SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());+ SignalSender sender = SignalSender.getInstance(getActivity(), preferences.getSignalUsername());sender.startHeartbeatTimer(preferences.getHeartbeatNotificationTimeMs());}} else if (!hbSwitchOn && isMonitoring) {preferences.activateHeartbeat(false);findPreference(PreferenceManager.HEARTBEAT_MONITOR_DELAY).setSummary(R.string.hearbeat_monitor_dialog);if (preferences.getMonitorServiceActive()) {- SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());+ SignalSender sender = SignalSender.getInstance(getActivity(), preferences.getSignalUsername());sender.stopHeartbeatTimer();}}@@ -423,7 +423,7 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Sharedboolean heartbeatActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.HEARTBEAT_MONITOR_ACTIVE)).isChecked();if (heartbeatActive && preferences.getMonitorServiceActive()) {- SignalSender sender = SignalSender.getInstance(getContext(), preferences.getSignalUsername());+ SignalSender sender = SignalSender.getInstance(getActivity(), preferences.getSignalUsername());sender.stopHeartbeatTimer();sender.startHeartbeatTimer(preferences.getHeartbeatNotificationTimeMs());}diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex 8c5a196..ab8aef8 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -43,7 +43,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteprivate final static String AUTHORITY = "org.havenapp.main.fileprovider";- public EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {+ EventTriggerAdapter(Context context, List<EventTrigger> eventTriggers) {this.context = context;this.eventTriggers = eventTriggers;diff --git a/src/main/java/org/havenapp/main/ui/PPAppIntro.java b/src/main/java/org/havenapp/main/ui/PPAppIntro.javaindex c54da30..8869d19 100644--- a/src/main/java/org/havenapp/main/ui/PPAppIntro.java+++ b/src/main/java/org/havenapp/main/ui/PPAppIntro.java@@ -33,12 +33,6 @@ public class PPAppIntro extends AppIntro {addSlide(AppIntroFragment.newInstance(getString(R.string.intro1_title), getString(R.string.intro1_desc),R.drawable.web_hi_res_512, getResources().getColor(R.color.colorPrimaryDark)));- /**- SliderPage sliderPage = new SliderPage();- sliderPage.setTitle(getString(R.string.intro2_title));- // sliderPage.setDescription("This is a demo of the AppIntro library.");- sliderPage.setBgColor(getResources().getColor(R.color.colorPrimaryDark));- addSlide(AppIntroFragment.newInstance(sliderPage));**/CustomSlideBigText cs1 = CustomSlideBigText.newInstance(R.layout.custom_slide_big_text);cs1.setTitle(getString(R.string.intro2_title));addSlide(cs1);diff --git a/src/main/res/layout/activity_monitor.xml b/src/main/res/layout/activity_monitor.xmlindex a02dd54..e82f4bf 100644--- a/src/main/res/layout/activity_monitor.xml+++ b/src/main/res/layout/activity_monitor.xml@@ -32,7 +32,7 @@android:gravity="center"android:text="@string/set_a_countdown_time"android:textColor="@color/White"- android:textSize="28dp"+ android:textSize="28sp"android:textStyle="bold" /><TextView