ushahidi · amadeu01 · Apr 17, 2018
diff --git a/build.gradle b/build.gradle
@@ -21,14 +21,15 @@ buildscript {
         maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
 
         maven { url 'https://jitpack.io' }
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0-beta3'
+        classpath 'com.android.tools.build:gradle:3.1.1'
         classpath 'me.tatarka:gradle-retrolambda:3.5.0'
         classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
         classpath 'com.github.triplet.gradle:play-publisher:1.1.5'
         classpath 'org.ajoberstar:gradle-git:1.6.0'
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.google.gms:google-services:3.1.0'
     }
 
     // Exclude the version that the android plugin depends on.

diff --git a/dependencies/dependencies.gradle b/dependencies/dependencies.gradle
@@ -23,10 +23,10 @@ allprojects {
 
 ext {
     //Android
-    androidBuildToolsVersion = "25.0.2"
+    androidBuildToolsVersion = "27.0.3"
     androidMinSdkVersion = 9
-    androidTargetSdkVersion = 22
-    androidCompileSdkVersion = 23
+    androidTargetSdkVersion = 27
+    androidCompileSdkVersion = 27
 
     //Libraries
     daggerVersion = '2.8'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 13 12:15:29 JST 2017
+#Wed Apr 11 09:54:02 BRT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/smssync/build.gradle b/smssync/build.gradle
@@ -43,9 +43,9 @@ def trackProperty() {
 }
 
 def readWhatsNewFile(filename) {
-    File file = new File('smssync/src/main/play/en-US/' + filename);
+    File file = new File('smssync/src/main/play/en-US/' + filename)
     return file.exists() ? file.text + '\n\n' :
-            new File('smssync/src/main/play/en-US/whatsnew').text;
+            new File('smssync/src/main/play/en-US/whatsnew').text
 }
 
 def globalConfiguration = rootProject.extensions.getByName("ext")
@@ -137,24 +137,16 @@ android {
     }
 
     android.applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            def outputFile = output.outputFile
-            if (outputFile != null && outputFile.name.endsWith('.apk')) {
-                def newName = outputFile.name.replace(outputFile.name,
-                        "smssync-${variant.name}-v" + defaultConfig.versionName + "-" +
-                                variant.buildType.name.toUpperCase() +
-                                ".apk");
-
-                output.outputFile = file("$project.buildDir/apk/" + newName);
-                if (output.zipAlign) {
-                    output.zipAlign.outputFile =
-                            file("$project.buildDir/apk/" + newName.replace("-unaligned", ""));
-                }
+        variant.outputs.all { output ->
+            if (outputFileName != null && outputFileName.endsWith('.apk')) {
+                outputFileName = "smssync-${variant.name}-v" + defaultConfig.versionName +
+                        "-" + variant.buildType.name.toUpperCase() + ".apk"
             }
         }
     }
 
     productFlavors {
+        flavorDimensions 'default'
 
         withAnalytics {
             applicationId 'org.addhen.smssync'
@@ -172,12 +164,13 @@ android {
     dexOptions {
         // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
         preDexLibraries = preDexEnabled && !isTravis
-        incremental = true;
+        incremental = true
     }
 
     testOptions {
         unitTests.returnDefaultValues = true
     }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8

diff --git a/smssync/src/main/java/org/addhen/smssync/smslib/util/Util.java b/smssync/src/main/java/org/addhen/smssync/smslib/util/Util.java
@@ -17,13 +17,15 @@
 
 package org.addhen.smssync.smslib.util;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Build;
 import android.telephony.TelephonyManager;
 
 /**
  * @author Ushahidi Team <[email protected]>
  */
+@SuppressLint("MissingPermission")
 public class Util {
 
     private static final int KITKAT = 19;

diff --git a/smssync/src/main/res/drawable/ic_empty_message_list_100dp.xml b/smssync/src/main/res/drawable/ic_empty_message_list_100dp.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:autoMirrored="true" android:height="100dp"
-        android:viewportHeight="24.0" android:viewportWidth="24.0"
-        android:width="100dp">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:autoMirrored="true"
+    android:height="100dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="100dp"
+    tools:ignore="UnusedAttribute,VectorRaster">
     <path android:fillColor="@color/grey_light"
-          android:pathData="M19,3H4.99c-1.1,0 -1.98,0.9 -1.98,2L3,19c0,1.1 0.89,2 1.99,2H19c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,12h-4c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3H4.99V5H19v10zm-3,-5h-2V7h-4v3H8l4,4 4,-4z"/>
+          android:pathData="M19,3H4.99c-1.1,0 -1.98,0.9 -1.98,2L3,19c0,1.1 0.89,2 1.99,2H19c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zm0,12h-4c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3H4.99V5H19v10zm-3,-5h-2V7h-4v3H8l4,4 4,-4z"
+        tools:ignore="VectorRaster" />
 </vector>
diff --git a/smssync/src/main/res/drawable/ic_phone_locked_grey_900_24dp.xml b/smssync/src/main/res/drawable/ic_phone_locked_grey_900_24dp.xml
@@ -18,10 +18,12 @@
 
 <!-- drawable/phone_locked.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:height="24dp"
-        android:width="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path android:fillColor="@color/grey_light"
-          android:pathData="M19.2,4H15.8V3.5C15.8,2.56 16.56,1.8 17.5,1.8C18.44,1.8 19.2,2.56 19.2,3.5M20,4V3.5A2.5,2.5 0 0,0 17.5,1A2.5,2.5 0 0,0 15,3.5V4A1,1 0 0,0 14,5V9A1,1 0 0,0 15,10H20A1,1 0 0,0 21,9V5A1,1 0 0,0 20,4M20,15.5C18.75,15.5 17.55,15.3 16.43,14.93C16.08,14.82 15.69,14.9 15.41,15.18L13.21,17.38C10.38,15.94 8.06,13.62 6.62,10.79L8.82,8.59C9.1,8.31 9.18,7.92 9.07,7.57C8.7,6.45 8.5,5.25 8.5,4A1,1 0 0,0 7.5,3H4A1,1 0 0,0 3,4A17,17 0 0,0 20,21A1,1 0 0,0 21,20V16.5A1,1 0 0,0 20,15.5Z"/>
+          android:pathData="M19.2,4H15.8V3.5C15.8,2.56 16.56,1.8 17.5,1.8C18.44,1.8 19.2,2.56 19.2,3.5M20,4V3.5A2.5,2.5 0 0,0 17.5,1A2.5,2.5 0 0,0 15,3.5V4A1,1 0 0,0 14,5V9A1,1 0 0,0 15,10H20A1,1 0 0,0 21,9V5A1,1 0 0,0 20,4M20,15.5C18.75,15.5 17.55,15.3 16.43,14.93C16.08,14.82 15.69,14.9 15.41,15.18L13.21,17.38C10.38,15.94 8.06,13.62 6.62,10.79L8.82,8.59C9.1,8.31 9.18,7.92 9.07,7.57C8.7,6.45 8.5,5.25 8.5,4A1,1 0 0,0 7.5,3H4A1,1 0 0,0 3,4A17,17 0 0,0 20,21A1,1 0 0,0 21,20V16.5A1,1 0 0,0 20,15.5Z"
+        tools:ignore="VectorRaster" />
 </vector>
diff --git a/smssync/src/main/res/drawable/ic_publish_check_box_100dp.xml b/smssync/src/main/res/drawable/ic_publish_check_box_100dp.xml
@@ -16,9 +16,13 @@
   ~ Ushahidi developers at [email protected].
   -->
 
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="100dp"
-        android:viewportHeight="24.0" android:viewportWidth="24.0"
-        android:width="100dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:height="100dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0"
+    android:width="100dp">
     <path android:fillColor="@color/grey_light"
-          android:pathData="M19,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zm-9,14l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"/>
+          android:pathData="M19,3H5c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zm-9,14l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"
+        tools:ignore="VectorRaster" />
 </vector>
diff --git a/smssync/src/main/res/drawable/ic_web_grey_900_100dp.xml b/smssync/src/main/res/drawable/ic_web_grey_900_100dp.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.29"
-        android:autoMirrored="true" android:height="100dp"
-        android:viewportHeight="24.0" android:viewportWidth="24.0"
-        android:width="100dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:alpha="0.29"
+    android:autoMirrored="true" android:height="100dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="100dp"
+    tools:ignore="UnusedAttribute,VectorRaster">
     <path android:fillColor="@color/grey_light"
-          android:pathData="M20,4H4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V6c0,-1.11 -0.89,-2 -2,-2zm0,14H4v-6h16v6zm0,-10H4V6h16v2z"/>
+          android:pathData="M20,4H4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V6c0,-1.11 -0.89,-2 -2,-2zm0,14H4v-6h16v6zm0,-10H4V6h16v2z"
+        tools:ignore="VectorRaster" />
 </vector>
diff --git a/smssync/src/main/res/layout/list_message_item.xml b/smssync/src/main/res/layout/list_message_item.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (c) 2010 - 2015 Ushahidi Inc
   ~ All rights reserved
   ~ Contact: [email protected]
@@ -17,93 +16,105 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                android:paddingStart="@dimen/view_spacing_large"
-                android:paddingEnd="@dimen/view_spacing_large"
-                android:paddingLeft="@dimen/view_spacing_large"
-                android:paddingRight="@dimen/view_spacing_large">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:paddingEnd="@dimen/view_spacing_large"
+    android:paddingLeft="@dimen/view_spacing_large"
+    android:paddingRight="@dimen/view_spacing_large"
+    android:paddingStart="@dimen/view_spacing_large">
+
     <FrameLayout
-            android:id="@+id/message_icon"
+        android:id="@+id/message_icon"
+        android:layout_width="@dimen/message_list_icon_size"
+        android:layout_height="@dimen/message_list_icon_size"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_below="@+id/message_date"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center_horizontal|top">
+
+        <ImageView
+            android:id="@+id/message_icons"
             android:layout_width="@dimen/message_list_icon_size"
             android:layout_height="@dimen/message_list_icon_size"
-            android:layout_below="@+id/message_date"
-            android:layout_gravity="center_horizontal|top"
+            android:layout_centerHorizontal="true"
             android:layout_centerVertical="true"
-            android:layout_alignParentLeft="true"
-            android:layout_alignParentStart="true">
-        <ImageView
-                android:id="@+id/message_icons"
-                android:layout_width="@dimen/message_list_icon_size"
-                android:layout_height="@dimen/message_list_icon_size"
-                android:src="@drawable/ic_call_white_18dp"
-                android:layout_centerVertical="true"
-                android:layout_centerHorizontal="true"/>
+            android:src="@drawable/ic_call_white_18dp"
+            tools:ignore="ObsoleteLayoutParam" />
+
         <ImageView
-                android:visibility="gone"
-                android:layout_width="@dimen/message_list_icon_size"
-                android:layout_height="@dimen/message_list_icon_size"
-                android:id="@+id/check_icon"
-                android:layout_centerVertical="true"
-                android:layout_centerHorizontal="true"/>
+            android:id="@+id/check_icon"
+            android:layout_width="@dimen/message_list_icon_size"
+            android:layout_height="@dimen/message_list_icon_size"
+            android:layout_centerHorizontal="true"
+            android:layout_centerVertical="true"
+            android:visibility="gone"
+            tools:ignore="ObsoleteLayoutParam" />
     </FrameLayout>
 
     <android.support.v7.widget.AppCompatTextView
-            android:id="@+id/message_from"
-            style="@style/TextView.Title"
-            android:layout_width="wrap_content"
-            android:text="512-123-4567"
-            android:lines="1"
-            android:paddingTop="@dimen/text_size_medium"
-            android:layout_alignParentTop="true"
-            android:textSize="@dimen/text_size_normal"
-            android:textStyle="normal"
-            android:layout_toRightOf="@+id/message_icon"/>
+        android:id="@+id/message_from"
+        style="@style/TextView.Title"
+        android:layout_width="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toRightOf="@+id/message_icon"
+        android:lines="1"
+        android:paddingTop="@dimen/text_size_medium"
+        android:text="512-123-4567"
+        android:textSize="@dimen/text_size_normal"
+        android:textStyle="normal" />
 
     <android.support.v7.widget.AppCompatTextView
-            android:id="@+id/message_date"
-            style="@style/TextView.Description"
-            android:layout_width="wrap_content"
-            android:text="5:09pm"
-            android:lines="1"
-            android:textColor="@color/grey_light"
-            android:paddingTop="@dimen/text_size_medium"
-            android:textSize="@dimen/text_size_normal"
-            android:layout_alignParentTop="true"
-            android:layout_toRightOf="@+id/message_from"
-            android:layout_toEndOf="@+id/message_from"/>
+        android:id="@+id/message_date"
+        style="@style/TextView.Description"
+        android:layout_width="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_toEndOf="@+id/message_from"
+        android:layout_toRightOf="@+id/message_from"
+        android:lines="1"
+        android:paddingTop="@dimen/text_size_medium"
+        android:text="5:09pm"
+        android:textColor="@color/grey_light"
+        android:textSize="@dimen/text_size_normal"
+        tools:ignore="HardcodedText" />
+
     <com.addhen.android.raiburari.presentation.ui.widget.CapitalizedTextView
-            android:id="@+id/message"
-            style="@style/TextView.Description"
-            android:layout_width="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="3"
-            android:textSize="@dimen/text_size_normal"
-            android:paddingRight="@dimen/view_spacing_normal"
-            android:text="Our Software Engineers build amazing running, cycling, and workout apps for our wearables"
-            android:layout_below="@+id/message_date"
-            android:layout_toRightOf="@+id/message_icon"/>
+        android:id="@+id/message"
+        style="@style/TextView.Description"
+        android:layout_width="wrap_content"
+        android:layout_below="@+id/message_date"
+        android:layout_toRightOf="@+id/message_icon"
+        android:ellipsize="end"
+        android:maxLines="3"
+        android:paddingRight="@dimen/view_spacing_normal"
+        android:text="Our Software Engineers build amazing running, cycling, and workout apps for our wearables"
+        android:textSize="@dimen/text_size_normal"
+        tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
+
     <ImageView
-            android:id="@+id/status_indicator"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:scaleType="centerCrop"
-            android:src="@drawable/ic_more_vert_grey_400_24dp"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:layout_alignParentEnd="true"/>
+        android:id="@+id/status_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/ic_more_vert_grey_400_24dp" />
+
     <android.support.v7.widget.AppCompatTextView
-            android:id="@+id/sent_message_type"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:text="Tasking"
-            android:textSize="@dimen/text_size_normal"
-            android:paddingLeft="@dimen/view_spacing_large"
-            android:paddingBottom="@dimen/view_spacing_large"
-            android:layout_below="@+id/message"
-            android:layout_alignLeft="@+id/message"
-            android:layout_alignStart="@+id/message"/>
+        android:id="@+id/sent_message_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/message"
+        android:layout_alignStart="@+id/message"
+        android:layout_below="@+id/message"
+        android:ellipsize="end"
+        android:lines="1"
+        android:paddingBottom="@dimen/view_spacing_large"
+        android:paddingLeft="@dimen/view_spacing_large"
+        android:text="Tasking"
+        android:textSize="@dimen/text_size_normal"
+        tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" />
 </RelativeLayout>
diff --git a/smssync/src/main/res/values-v14/themes.xml b/smssync/src/main/res/values-v14/themes.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.Light">
+        <item name="colorControlHighlight">@color/grey_lighter</item>
+        <item name="colorAccent">@color/color_accent</item>
+        <item name="colorPrimary">@color/color_primary</item>
+        <item name="colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="lineColorDivider">@color/grey_lighter</item>
+        <item name="windowActionModeOverlay">true</item>
+        <item name="actionModeBackground">@android:color/background_dark</item>
+        <item name="android:actionModeStyle">@style/AppTheme.SmsSync.ActionMode</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+    </style>
+</resources>