Fixed crash on showing logic for stocks

thonedary92 · Aug 24, 2015 · 3c087c4 · 3c087c4
1 parent 47fdc41
commit 3c087c4
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 4 deletions.
diff --git a/app/src/main/java/com/morristaedt/mirror/MirrorActivity.java b/app/src/main/java/com/morristaedt/mirror/MirrorActivity.java
@@ -137,7 +137,7 @@ private void setViewState() {
         ForecastModule.getHourlyForecast(getResources(), 40.681045, -73.9931749, mForecastListener);
         XKCDModule.getXKCDForToday(mXKCDListener);
 
-        if (WeekUtil.isWeekday()) {
+        if (WeekUtil.isWeekday() && WeekUtil.afterFive()) {
             YahooFinanceModule.getStockForToday("ETSY", mStockListener);
         } else {
             mStockText.setVisibility(View.GONE);

diff --git a/app/src/main/java/com/morristaedt/mirror/modules/ForecastModule.java b/app/src/main/java/com/morristaedt/mirror/modules/ForecastModule.java
@@ -57,7 +57,7 @@ protected void onPostExecute(ForecastResponse forecastResponse) {
                         listener.onWeatherToday(forecastResponse.currently.getDisplayTemperature() + " " + forecastResponse.currently.summary);
                     }
 
-                    if (WeekUtil.isWeekday() && forecastResponse.hourly != null && forecastResponse.hourly.data != null) {
+                    if (WeekUtil.isWeekday() && !WeekUtil.afterFive() && forecastResponse.hourly != null && forecastResponse.hourly.data != null) {
                         listener.onShouldBike(true, shouldBikeToday(forecastResponse.hourly.data));
                     } else {
                         listener.onShouldBike(false, true);

diff --git a/app/src/main/java/com/morristaedt/mirror/requests/YahooStockResponse.java b/app/src/main/java/com/morristaedt/mirror/requests/YahooStockResponse.java
@@ -1,5 +1,7 @@
 package com.morristaedt.mirror.requests;
 
+import android.text.TextUtils;
+
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
@@ -24,8 +26,12 @@ public class YahooQuoteResponse {
         public float LastTradePriceOnly;
 
         public BigDecimal getPercentageChange() {
-            BigDecimal decimalPercentage = new BigDecimal(PercentChange.trim().replace("%", "")).divide(BigDecimal.valueOf(100), RoundingMode.CEILING);
-            return decimalPercentage;
+            if (!TextUtils.isEmpty(PercentChange)) {
+                BigDecimal decimalPercentage = new BigDecimal(PercentChange.trim().replace("%", "")).divide(BigDecimal.valueOf(100), RoundingMode.CEILING);
+                return decimalPercentage;
+            } else {
+                return BigDecimal.valueOf(0);
+            }
         }
     }
 

diff --git a/app/src/main/java/com/morristaedt/mirror/utils/WeekUtil.java b/app/src/main/java/com/morristaedt/mirror/utils/WeekUtil.java
@@ -11,4 +11,9 @@ public static boolean isWeekday() {
         int dayOfWeek = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
         return dayOfWeek != Calendar.SATURDAY && dayOfWeek != Calendar.SUNDAY;
     }
+
+    public static boolean afterFive(){
+        int hourOfDay = Calendar.getInstance().get(Calendar.HOUR_OF_DAY);
+        return hourOfDay >= 17;
+    }
 }
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png