Redundant String.toString() operations removed (getodk#634)

championoverthinker · Mar 16, 2017 · f2f119a · f2f119a
1 parent 96eb66c
commit f2f119a
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/EncryptionUtils.java b/collect_app/src/main/java/org/odk/collect/android/utilities/EncryptionUtils.java
@@ -187,7 +187,7 @@ public static final class EncryptedFormInformation {
             // start building elementSignatureSource...
             appendElementSignatureSource(formId);
             if (formVersion != null) {
-                appendElementSignatureSource(formVersion.toString());
+                appendElementSignatureSource(formVersion);
             }
             appendElementSignatureSource(base64RsaEncryptedSymmetricKey);
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/AlignedImageWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/AlignedImageWidget.java
@@ -288,7 +288,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/AnnotateWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/AnnotateWidget.java
@@ -307,7 +307,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/AudioWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/AudioWidget.java
@@ -225,7 +225,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/DrawWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/DrawWidget.java
@@ -198,7 +198,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/ImageWebViewWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/ImageWebViewWidget.java
@@ -297,7 +297,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/ImageWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/ImageWidget.java
@@ -250,7 +250,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/SignatureWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/SignatureWidget.java
@@ -197,7 +197,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/VideoWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/VideoWidget.java
@@ -263,7 +263,7 @@ public void clearAnswer() {
     @Override
     public IAnswerData getAnswer() {
         if (mBinaryName != null) {
-            return new StringData(mBinaryName.toString());
+            return new StringData(mBinaryName);
         } else {
             return null;
         }