Fixed replacement of html characters in profesores description

moyamejiasr · Sep 13, 2018 · 5e75ca3 · 5e75ca3
1 parent ea43f60
commit 5e75ca3
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -87,16 +87,27 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-main-apk-res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.onelio.connectu"
         minSdkVersion 18
         targetSdkVersion 27
-        versionCode 135
-        versionName "2.3.4"
+        versionCode 136
+        versionName "2.3.5"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

diff --git a/app/src/main/java/com/onelio/connectu/Activities/Apps/Materiales/MaterialesActivity.java b/app/src/main/java/com/onelio/connectu/Activities/Apps/Materiales/MaterialesActivity.java
@@ -33,7 +33,6 @@
 import java.util.List;
 
 public class MaterialesActivity extends AppCompatActivity {
-
     private App app;
     private MaterialesRequest request;
 

diff --git a/app/src/main/java/com/onelio/connectu/Activities/Apps/Profesores/ProfesoresActivity.java b/app/src/main/java/com/onelio/connectu/Activities/Apps/Profesores/ProfesoresActivity.java
@@ -34,7 +34,6 @@
 import java.util.List;
 
 public class ProfesoresActivity extends AppCompatActivity {
-
     App app;
 
     //RecyclerView

diff --git a/app/src/main/java/com/onelio/connectu/Activities/Apps/Profesores/ProfesoresViewActivity.java b/app/src/main/java/com/onelio/connectu/Activities/Apps/Profesores/ProfesoresViewActivity.java
@@ -54,9 +54,9 @@ protected void onCreate(Bundle savedInstanceState) {
         name.setText(data.getName());
         subject.setText(data.getSubject());
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            text.setText(Html.fromHtml(data.getDescription().replace("&nbsp", " "), Html.FROM_HTML_MODE_COMPACT));
+            text.setText(Html.fromHtml(data.getDescription(), Html.FROM_HTML_MODE_COMPACT).toString().replace("&nbsp", " "));
         } else {
-            text.setText(Html.fromHtml(data.getDescription().replace("nbsp", " ")));
+            text.setText(Html.fromHtml(data.getDescription()).toString().replace("&nbsp", " "));
         }
 
     }

diff --git a/app/src/main/java/com/onelio/connectu/Services/UAService.java b/app/src/main/java/com/onelio/connectu/Services/UAService.java
@@ -28,8 +28,7 @@
 import org.json.JSONObject;
 
 public class UAService extends Service {
-
-    //Data
+    // Data
     App app;
 
     @Nullable

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <resources>
     <!-- AppData -->
     <string name="app_name">ConnectU</string>
-    <string name="app_version">2.3.4</string>
+    <string name="app_version">2.3.5</string>
     <!-- Errors -->
     <string name="app_name_error">ConnectU Error</string>
     <string name="error_unexpected">Unexpected error</string>