Fix polls not properly escaping text

micahlt · Aug 26, 2024 · 6f551ec · 6f551ec
1 parent f69a860
commit 6f551ec
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 15 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -82,8 +82,8 @@ android {
  applicationId "com.micahlindley.offsides"
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
- versionCode 35
- versionName "0.7.1"
+ versionCode 36
+ versionName "0.7.2"
  }
  signingConfigs {
  debug {

diff --git a/android/app/release/offsides-0-7-1.apk → android/app/release/app-release.apk b/android/app/release/offsides-0-7-1.apk → android/app/release/app-release.apk
diff --git a/android/app/release/output-metadata.json b/android/app/release/output-metadata.json
@@ -11,8 +11,8 @@
  "type": "SINGLE",
  "filters": [],
  "attributes": [],
- "versionCode": 35,
- "versionName": "0.7.1",
+ "versionCode": 36,
+ "versionName": "0.7.2",
  "outputFile": "app-release.apk"
  }
  ],

diff --git a/docs/latest.json b/docs/latest.json
@@ -1,4 +1,4 @@
 {
- "latestVersion": "0.7.1",
- "changelog": "This update includes minor bugfixes as well as support for viewing and voting on polls."
+ "latestVersion": "0.7.2",
+ "changelog": "This update includes a bugfix for the issue that caused app crashes when polls were viewed."
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "offsides",
- "version": "0.7.1",
+ "version": "0.7.2",
  "private": true,
  "scripts": {
  "android": "react-native run-android",

diff --git a/src/components/Poll.jsx b/src/components/Poll.jsx
@@ -24,6 +24,8 @@ function Poll({ poll }) {
  API.voteOnPoll(poll.id, choiceIndex);
  };
 
+ console.log(poll);
+
  if (!poll) return null;
  return (
  <View>
@@ -44,13 +46,19 @@ function Poll({ poll }) {
  padding: 10,
  borderRadius: 10,
  }}>
- <Text
- style={{ color: colors.onSecondaryContainer }}
- variant="labelLarge">
- {option.text}
- </Text>
- {option.count && (
+ {!!option?.text ? (
+ <Text
+ style={{ color: colors.onSecondaryContainer }}
+ variant="labelLarge">
+ {option.text}
+ </Text>
+ ) : (
+ <></>
+ )}
+ {!!option?.count ? (
  <Text variant="bodySmall">{option.count} votes</Text>
+ ) : (
+ <></>
  )}
  </View>
  </TouchableRipple>

diff --git a/src/screens/HomeScreen.jsx b/src/screens/HomeScreen.jsx
@@ -127,6 +127,7 @@ function HomeScreen({ navigation, route }) {
  setPosts([]);
  API.getGroupPosts(override || params.groupID, postCategory).then(
  res => {
+ console.log('GET GROUP POSTS');
  if (res.posts) {
  setPosts(res.posts.filter(i => i.id));
  setCursor(res.cursor);
@@ -141,6 +142,7 @@ function HomeScreen({ navigation, route }) {
  postCategory,
  cursor,
  ).then(res => {
+ console.log('GET POSTS');
  if (res.posts) {
  setPosts(posts.concat(res.posts.filter(i => i.id)));
  setCursor(res.cursor);