Merge pull request #513 from ivanovlev/master

Simplification of transliteration integration

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/DebugActivity.java

@@ -180,9 +180,10 @@ public class DebugActivity extends GBActivity {
             @Override
             public void onClick(View v) {
                 MusicSpec musicSpec = new MusicSpec();
-                musicSpec.artist = editContent.getText().toString() + "(artist)";
+                String testString = editContent.getText().toString();
-                musicSpec.album = editContent.getText().toString() + "(album)";
+                musicSpec.artist = testString + "(artist)";
-                musicSpec.track = editContent.getText().toString() + "(track)";
+                musicSpec.album = testString + "(album)";
+                musicSpec.track = testString + "(track)";
                 musicSpec.duration = 10;
                 musicSpec.trackCount = 5;
                 musicSpec.trackNr = 2;

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java

@@ -19,10 +19,25 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
 import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.service.DeviceCommunicationService;
+import nodomain.freeyourgadget.gadgetbridge.util.LanguageUtils;
 
 public class GBDeviceService implements DeviceService {
     protected final Context mContext;
     private final Class<? extends Service> mServiceClass;
+    private final String[] transliterationExtras = new String[]{
+            EXTRA_NOTIFICATION_PHONENUMBER,
+            EXTRA_NOTIFICATION_SENDER,
+            EXTRA_NOTIFICATION_SUBJECT,
+            EXTRA_NOTIFICATION_TITLE,
+            EXTRA_NOTIFICATION_BODY,
+            EXTRA_NOTIFICATION_SOURCENAME,
+            EXTRA_CALL_PHONENUMBER,
+            EXTRA_MUSIC_ARTIST,
+            EXTRA_MUSIC_ALBUM,
+            EXTRA_MUSIC_TRACK,
+            EXTRA_CALENDAREVENT_TITLE,
+            EXTRA_CALENDAREVENT_DESCRIPTION
+    };
 
     public GBDeviceService(Context context) {
         mContext = context;
@@ -34,6 +49,14 @@ public class GBDeviceService implements DeviceService {
     }
 
     protected void invokeService(Intent intent) {
+        if(LanguageUtils.transliterate()){
+            for (String extra: transliterationExtras) {
+                if (intent.hasExtra(extra)){
+                    intent.putExtra(extra, LanguageUtils.transliterate(intent.getStringExtra(extra)));
+                }
+            }
+        }
+
         mContext.startService(intent);
     }
 

app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java

@@ -51,7 +51,6 @@ import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec;
 import nodomain.freeyourgadget.gadgetbridge.util.DeviceHelper;
 import nodomain.freeyourgadget.gadgetbridge.util.GB;
 import nodomain.freeyourgadget.gadgetbridge.util.GBPrefs;
-import nodomain.freeyourgadget.gadgetbridge.util.LanguageUtils;
 import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
 
 import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.ACTION_ADD_CALENDAREVENT;
@@ -322,12 +321,12 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 break;
             case ACTION_NOTIFICATION: {
                 NotificationSpec notificationSpec = new NotificationSpec();
-                notificationSpec.phoneNumber = getStringExtra(intent, EXTRA_NOTIFICATION_PHONENUMBER);
+                notificationSpec.phoneNumber = intent.getStringExtra(EXTRA_NOTIFICATION_PHONENUMBER);
-                notificationSpec.sender = getStringExtra(intent, EXTRA_NOTIFICATION_SENDER);
+                notificationSpec.sender = intent.getStringExtra(EXTRA_NOTIFICATION_SENDER);
-                notificationSpec.subject = getStringExtra(intent, EXTRA_NOTIFICATION_SUBJECT);
+                notificationSpec.subject = intent.getStringExtra(EXTRA_NOTIFICATION_SUBJECT);
-                notificationSpec.title = getStringExtra(intent, EXTRA_NOTIFICATION_TITLE);
+                notificationSpec.title = intent.getStringExtra(EXTRA_NOTIFICATION_TITLE);
-                notificationSpec.body = getStringExtra(intent, EXTRA_NOTIFICATION_BODY);
+                notificationSpec.body = intent.getStringExtra(EXTRA_NOTIFICATION_BODY);
-                notificationSpec.sourceName = getStringExtra(intent, EXTRA_NOTIFICATION_SOURCENAME);
+                notificationSpec.sourceName = intent.getStringExtra(EXTRA_NOTIFICATION_SOURCENAME);
                 notificationSpec.type = (NotificationType) intent.getSerializableExtra(EXTRA_NOTIFICATION_TYPE);
                 notificationSpec.id = intent.getIntExtra(EXTRA_NOTIFICATION_ID, -1);
                 notificationSpec.flags = intent.getIntExtra(EXTRA_NOTIFICATION_FLAGS, 0);
@@ -369,8 +368,8 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 calendarEventSpec.type = intent.getByteExtra(EXTRA_CALENDAREVENT_TYPE, (byte) -1);
                 calendarEventSpec.timestamp = intent.getIntExtra(EXTRA_CALENDAREVENT_TIMESTAMP, -1);
                 calendarEventSpec.durationInSeconds = intent.getIntExtra(EXTRA_CALENDAREVENT_DURATION, -1);
-                calendarEventSpec.title = getStringExtra(intent, EXTRA_CALENDAREVENT_TITLE);
+                calendarEventSpec.title = intent.getStringExtra(EXTRA_CALENDAREVENT_TITLE);
-                calendarEventSpec.description = getStringExtra(intent, EXTRA_CALENDAREVENT_DESCRIPTION);
+                calendarEventSpec.description = intent.getStringExtra(EXTRA_CALENDAREVENT_DESCRIPTION);
                 mDeviceSupport.onAddCalendarEvent(calendarEventSpec);
                 break;
             }
@@ -415,7 +414,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
             case ACTION_CALLSTATE:
                 int command = intent.getIntExtra(EXTRA_CALL_COMMAND, CallSpec.CALL_UNDEFINED);
 
-                String phoneNumber = getStringExtra(intent, EXTRA_CALL_PHONENUMBER);
+                String phoneNumber = intent.getStringExtra(EXTRA_CALL_PHONENUMBER);
                 String callerName = null;
                 if (phoneNumber != null) {
                     callerName = getContactDisplayNameByNumber(phoneNumber);
@@ -441,9 +440,9 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
                 break;
             case ACTION_SETMUSICINFO:
                 MusicSpec musicSpec = new MusicSpec();
-                musicSpec.artist = getStringExtra(intent, EXTRA_MUSIC_ARTIST);
+                musicSpec.artist = intent.getStringExtra(EXTRA_MUSIC_ARTIST);
-                musicSpec.album = getStringExtra(intent, EXTRA_MUSIC_ALBUM);
+                musicSpec.album = intent.getStringExtra(EXTRA_MUSIC_ALBUM);
-                musicSpec.track = getStringExtra(intent, EXTRA_MUSIC_TRACK);
+                musicSpec.track = intent.getStringExtra(EXTRA_MUSIC_TRACK);
                 musicSpec.duration = intent.getIntExtra(EXTRA_MUSIC_DURATION, 0);
                 musicSpec.trackCount = intent.getIntExtra(EXTRA_MUSIC_TRACKCOUNT, 0);
                 musicSpec.trackNr = intent.getIntExtra(EXTRA_MUSIC_TRACKNR, 0);
@@ -706,18 +705,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
             // ignore, just return name below
         }
 
-        return LanguageUtils.transliterate()
+        return name;
-                    ? LanguageUtils.transliterate(name)
-                    : name;
-    }
-
-    //Standard method with transliteration
-    private String getStringExtra(Intent intent, String event){
-        String extra = intent.getStringExtra(event);
-
-        return LanguageUtils.transliterate()
-                    ? LanguageUtils.transliterate(extra)
-                    : extra;
     }
 
     @Override

app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationServiceTestCase.java

@@ -1,17 +1,21 @@
 package nodomain.freeyourgadget.gadgetbridge.service;
 
 import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
 
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
 import nodomain.freeyourgadget.gadgetbridge.GBException;
 import nodomain.freeyourgadget.gadgetbridge.impl.GBDevice;
 import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
 import nodomain.freeyourgadget.gadgetbridge.test.TestBase;
 
+import static nodomain.freeyourgadget.gadgetbridge.model.DeviceService.EXTRA_NOTIFICATION_BODY;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
@@ -97,4 +101,17 @@ public class DeviceCommunicationServiceTestCase extends TestBase {
         inOrder.verifyNoMoreInteractions();
     }
 
+    @Test
+    public void testTransliterationSupport() {
+        SharedPreferences settings = GBApplication.getPrefs().getPreferences();
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putBoolean("transliteration", true);
+        editor.commit();
+
+        Intent intent = mDeviceService.createIntent().putExtra(EXTRA_NOTIFICATION_BODY, "Прõсто текčт");
+        mDeviceService.invokeService(intent);
+        String result = intent.getStringExtra(EXTRA_NOTIFICATION_BODY);
+
+        assertTrue("Transliteration support fail!", result.equals("Prosto tekct"));
+    }
 }

app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/TestDeviceService.java

@@ -29,7 +29,7 @@ class TestDeviceService extends GBDeviceService {
         // calling though to the service natively does not work with robolectric,
         // we have to use the ServiceController to do that
         service.onStartCommand(intent, Service.START_FLAG_REDELIVERY, (int) (Math.random() * 10000));
-//        super.invokeService(intent);
+        super.invokeService(intent);
     }
 
     @Override

app/src/test/java/nodomain/freeyourgadget/gadgetbridge/test/LanguageUtilsTest.java

@@ -0,0 +1,38 @@
+package nodomain.freeyourgadget.gadgetbridge.test;
+
+import android.content.SharedPreferences;
+
+import org.junit.Test;
+
+import nodomain.freeyourgadget.gadgetbridge.GBApplication;
+import nodomain.freeyourgadget.gadgetbridge.util.LanguageUtils;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests LanguageUtils
+ */
+public class LanguageUtilsTest extends TestBase {
+    @Test
+    public void testStringTransliterate() throws Exception {
+        //input with cyrillic and diacritic letters
+        String input = "Прõсто текčт";
+        String output = LanguageUtils.transliterate(input);
+        String result = "Prosto tekct";
+
+        assertTrue(String.format("Transliteration fail! Expected '%s', but found '%s'}", result, output), output.equals(result));
+    }
+
+    @Test
+    public void testTransliterateOption() throws Exception {
+        assertFalse("Transliteration option fail! Expected 'Off' by default, but result is 'On'", LanguageUtils.transliterate());
+
+        SharedPreferences settings = GBApplication.getPrefs().getPreferences();
+        SharedPreferences.Editor editor = settings.edit();
+        editor.putBoolean("transliteration", true);
+        editor.commit();
+
+        assertTrue("Transliteration option fail! Expected 'On', but result is 'Off'", LanguageUtils.transliterate());
+    }
+}