Google wants us to say we upload contacts, even though we don't

Stephen Paul Weber created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/generator/IqGenerator.java | 16 ++
src/playstore/res/values/strings.xml                            |  4 
2 files changed, 18 insertions(+), 2 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/generator/IqGenerator.java

@@ -38,6 +38,7 @@ import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.DownloadableFile;
 import eu.siacs.conversations.entities.Message;
 import eu.siacs.conversations.services.MessageArchiveService;
+import eu.siacs.conversations.services.QuickConversationsService;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xml.Namespace;
@@ -73,10 +74,21 @@ public class IqGenerator extends AbstractGenerator {
         Element query = packet.query("jabber:iq:version");
         query.addChild("name").setContent(mXmppConnectionService.getString(R.string.app_name));
         query.addChild("version").setContent(getIdentityVersion());
+        final StringBuilder os = new StringBuilder();
         if ("chromium".equals(android.os.Build.BRAND)) {
-            query.addChild("os").setContent("Chrome OS");
+            os.append("Chrome OS");
         } else {
-            query.addChild("os").setContent("Android");
+            os.append("Android");
+        }
+        os.append(" ");
+        os.append(android.os.Build.VERSION.RELEASE);
+        if (QuickConversationsService.isPlayStoreFlavor()) {
+            os.append(" (");
+            os.append(android.os.Build.BOARD);
+            os.append(", ");
+            os.append(android.os.Build.FINGERPRINT);
+            os.append(")");
+            query.addChild("os").setContent(os.toString());
         }
         return packet;
     }

src/playstore/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="sync_with_contacts_long">%1$s processes your contact list locally, on your device, to show you the names and profile pictures for matching contacts on the Jabber network.\n\nThis will upload your contact list to the server.</string>
+</resources>