restored trackid click on chart view with the new mobile API

kike-canaries · Mar 17, 2022 · c5ad286 · c5ad286
1 parent 2d508c3
commit c5ad286
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/ChartFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/ChartFragment.java
@@ -39,6 +39,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import butterknife.BindView;
@@ -349,7 +350,7 @@ private void updateMap() {
 
     private void setTrackDescription(SensorTrack track, boolean isPublishedData){
         chart_name.setText("ID:"+track.getName());
-        chart_name.setClickable(false);  // we need fix it (heroku issue)
+        chart_name.setClickable(true);  // we need fix it (heroku issue)
         if(!isPublishedData) {
             chart_name.setTextColor(getResources().getColor(R.color.black));
         }
@@ -370,9 +371,10 @@ private void setTrackDescription(SensorTrack track, boolean isPublishedData){
     private View.OnClickListener onChartIdClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
+            Logger.w(TAG, "[CHART] onChartIdClick");
             if(recordId!=null) UITools.viewLink(
-                    getActivity(),
-                    getString(R.string.url_chart_get_data)+recordId+"?output=json"
+                    requireContext(),
+                    getString(R.string.url_chart_get_data)+recordId
             );
         }
     };

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -107,7 +107,6 @@
     <string name="key_device_info">key_device_info</string>
     <string name="key_setting_vars">key_settings_vars</string>
     <string name="title_device_status">Estado bluetooth:</string>
-    <string name="url_chart_get_data">http://canairio.herokuapp.com/tracks/get/</string>
     <string name="msg_chart_sharing">Compartiendo datos en la pestaña público…</string>
     <string name="bt_dialog_cancel">Cancelar</string>
     <string name="bt_dialog_agree">Estoy de acuerdo</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -107,7 +107,7 @@
     <string name="key_device_info">key_device_info</string>
     <string name="key_setting_vars">key_settings_vars</string>
     <string name="title_device_status">Bluetooth status:</string>
-    <string name="url_chart_get_data">http://canairio.herokuapp.com/tracks/get/</string>
+    <string name="url_chart_get_data" translatable="false">http://api.canair.io:8080/tracks/</string>
     <string name="msg_chart_sharing">Sharing data to public tab..</string>
     <string name="bt_dialog_cancel">Cancel</string>
     <string name="bt_dialog_agree">I agree</string>