Fixed error caused after denying location permission.

ocariot · Feb 7, 2020 · 51929f6 · 51929f6
1 parent f981051
commit 51929f6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "br.edu.uepb.nutes.ocariot"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 13
-        versionName "1.10.1"
+        versionCode 14
+        versionName "1.10.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         manifestPlaceholders = [

diff --git a/app/src/main/java/br/edu/uepb/nutes/ocariot/data/model/ocariot/Child.java b/app/src/main/java/br/edu/uepb/nutes/ocariot/data/model/ocariot/Child.java
@@ -100,8 +100,7 @@ public void setFitBitAccess(UserAccess fitBitAccess) {
     public boolean isFitbitAccessValid() {
         if (this.fitbitStatus == null) return false;
         return fitbitStatus.equalsIgnoreCase(UserAccess.TokenStatus.VALID) ||
-                fitbitStatus.equalsIgnoreCase(UserAccess.TokenStatus.EXPIRED) ||
-                fitbitStatus.equalsIgnoreCase(UserAccess.TokenStatus.RATE_LIMIT);
+                fitbitStatus.equalsIgnoreCase(UserAccess.TokenStatus.EXPIRED);
     }
 
     /**

diff --git a/app/src/main/java/br/edu/uepb/nutes/ocariot/view/ui/fragment/IotFragment.java b/app/src/main/java/br/edu/uepb/nutes/ocariot/view/ui/fragment/IotFragment.java
@@ -211,9 +211,8 @@ public void onResume() {
             if (!hasLocationPermissions()) {
                 requestLocationPermission();
                 return;
-            } else {
-                mBoxEnableLocation.setVisibility(View.GONE);
             }
+            mBoxEnableLocation.setVisibility(View.GONE);
             if (mHRManager.isConnected()) mBoxHRLoading.setVisibility(View.GONE);
             else mBoxHRLoading.setVisibility(View.VISIBLE);
             mScanner.stopScan();
@@ -570,8 +569,8 @@ public void onReceive(Context context, Intent intent) {
                     case BluetoothAdapter.STATE_ON:
                         Timber.d("BluetoothAdapter.STATE_ON");
                         mBoxEnableBluetooth.setVisibility(View.GONE);
-                        mBoxHRLoading.setVisibility(View.VISIBLE);
                         if (!hasLocationPermissions()) requestLocationPermission();
+                        else mBoxHRLoading.setVisibility(View.VISIBLE);
                         mScanner.stopScan();
                         mScanner.startScan(mScannerCallback);
                         break;

diff --git a/app/src/main/res/layout/fragment_iot.xml b/app/src/main/res/layout/fragment_iot.xml
@@ -37,7 +37,7 @@
             android:background="@color/colorWarning"
             android:orientation="vertical"
             android:padding="@dimen/default_padding"
-            android:visibility="visible">
+            android:visibility="gone">
 
             <TextView
                 android:layout_width="wrap_content"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -77,7 +77,7 @@
     <string name="key_signout" translatable="false">key_signout</string>
     <string name="key_sync_data" translatable="false">key_sync_data</string>
     <string name="key_children" translatable="false">key_children_manager</string>
-    <string name="settings_summary_version" translatable="false">1.10.1</string>
+    <string name="settings_summary_version" translatable="false">1.10.2</string>
     <string name="login_with_fitbit">Provide access to Fitbit</string>
     <string name="login_do_not_user_fitbit">Do not currently use Fitbit</string>
     <string name="settings_title">Settings</string>