Merge branch 'develop'

Author: eyedol

.gitignore

@@ -14,7 +14,7 @@ target
 out
 proguard.cfg
 proguard-project.txt
-build
+build/
 .gradle
 gradle-app.setting
 gradle.properties

BUILDING.md

@@ -54,38 +54,28 @@ $ hugo server -w
 
 You then preview the site at [http://localhost:1313]( http://localhost:1313)
 
-### Compile HTML files
+## Release checklist
+These are guidelines to follow when you're about to make a release.
+### Prepare
+- [ ] Set release date and notify relevant stakeholders.
+- [ ] Write changelog.
+  - [ ] Make sure the relevant play store release info has been updated. Look inside `play/en-US` folder.
+       Usually you update this with the changelog entries for the version to be released.
+  - [ ] Make sure changelog.json is updated and it validates. Use [jsonlint](http://jsonlint.com/) to validate the file.
+- [ ] Request for design asset if needed.
+- [ ] Draft a release announcement.
+- [ ] Make sure documentation on the website is updated to reflect any feature additions or changes in
+   the release.
+- [ ] Make a local preview of the website to make sure nothing is broken. Refer to [How To Build SMSSync website above](#how-to-build-smssync-website).
+
+### Release
+- [ ] Increase the 'versionCode' number in `smssync/build.gradle`
+- [ ] Issue the `./release.sh` command to make a release. This command has automated a lot of the release process.
+- [ ] Attach the release APK to the release tag on github. In the future this will be automated.
 
-Compile the ruhoh site to HTML so it can be published to a hosting server. We use github pages to host SMSSync's website.
-
-```
-$ cd website-src
-
-$ bundle exec ruhoh  compile '<path_to_a_folder_to_compile_the_html_into>'
-
-```
-
-**Note:** The folder to compile the html files into has to be empty as the `ruhoh compile` command will delete any files in it.
-
-### Publish compiled HTML files
-
-Publish the compiled HTML files to [github pages](http://ushahidi.github.io/SMSSync/)
-
-```
-$ cd website-src/public
-
-$ git init .
-
-$ git add .
-
-$ git commit -m "<update_message>"
-
-$ git push [email protected]:ushahidi/SMSSync.git master:gh-pages --force
-
-```
 ## Release Build
 
-To make a release make sure you have `gradle.properties` in the root of the `app` module with the
+To make a release make sure you have `gradle.properties` in the root of `smssync` folder with the
 following content.
 
 **gradle.properties**
@@ -119,4 +109,7 @@ Then in the project's root directory, issue:
 `./release major milestone alpha`
 
 This should build the app, version it, create a tag and push it to the remote repo and publish
-to the Google Playstore's alpha track.
+it to the Google Playstore's alpha track.
+
+Note: always update the relevant stage and track for the release. Issue `./release` to know more
+about the valid options for the release command.

README.md

@@ -6,6 +6,12 @@ Welcome to **"SMSSync"**, an android application that turns your android powered
 
 Read about it at **[smssync.ushahidi.com](http://smssync.ushahidi.com/)**.
 
+---
+<a href="http://smssync.ushahidi.com/screenshots/"><img src="http://smssync.ushahidi.com/images/screenshots/settings.png" width="155px" height="272px" alt="Settings " title="Settings"></a> <a href="http://smssync.ushahidi.com/screenshots/"><img src="http://smssync.ushahidi.com/images/screenshots/pending_messages.png" width="155px" height="272px" alt="Pending Messages" title="Pending Messages"></a> <a href="http://smssync.ushahidi.com/screenshots/"><img src="http://smssync.ushahidi.com/images/screenshots/log.png" width="155px" height="272px" alt="Logs" title="Logs"></a>
+---
+
+[![F-Droid](https://raw.githubusercontent.com/ushahidi/SMSSync/develop/art/f-droid-badge.png)](https://f-droid.org/repository/browse/?fdid=org.addhen.smssync "F-Droid Store") [![GitHub](https://raw.githubusercontent.com/ushahidi/SMSSync/develop/art/github-badge.png)](https://github.com/ushahidi/SMSSync/releases "GitHub Releases") [![Playstore](https://raw.githubusercontent.com/ushahidi/SMSSync/develop/art/playstore-badge.png)](https://play.google.com/store/apps/details?id=org.addhen.smssync "Google Playstore")
+
 ## Installation
 
 Installation and configuration details are [here][1].

art/f-droid-badge.png

@@ -21,7 +21,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
         classpath 'com.github.triplet.gradle:play-publisher:1.0.4'
         classpath 'org.ajoberstar:gradle-git:1.1.0'

art/github-badge.png

@@ -1,4 +1,13 @@
 [
+  {
+    "version": "v2.8.1",
+    "date": "5th June, 2015",
+    "features": [],
+    "bugs": [
+      "Fixed Navigation drawer. Items not showing on older devices.",
+      "Fixed alert code sending wrong info when querying for battery level."
+    ]
+  },
   {
     "version": "v2.8.0",
     "date": "4th May, 2015",

art/playstore-badge.png

@@ -1,7 +1,7 @@
 {
   "title": "List of contributors to the SMSSync project",
   "note": "Sorted by last name",
-  "total": 16,
+  "total": 17,
   "contributors": [
     {
       "name": "Milan Andric",
@@ -200,6 +200,17 @@
         "latitude": 52.29778,
         "longitude": 104.29639
       }
+    },
+    {
+      "name": "Kirk Saviour Agbenyegah",
+      "email": "[email protected]",
+      "website": "",
+      "description": "Bug fixes",
+      "country": {
+        "name": "Ghana",
+        "latitude": 5.5500,
+        "longitude": 0.2000
+      }
     }
   ]
 }

build.gradle

@@ -39,32 +39,8 @@ echo "Building a release apk"
 
 ./gradlew release -Prelease.scope=$SCOPE -Prelease.stage=$STAGE -PuploadTrack=$TRACK
 
-# Compile HTML files
-
-# cd into the website folder
-echo "Compiling website"
-
-pushd website-src
-
-hugo -d $TMP_DIR
-
-popd
-
-pushd $TMP_DIR
-git init
-
-git add .
-
-git commit -m "Updating webiste..."
-
-git push [email protected]:ushahidi/SMSSync.git master:gh-pages --force
-
-popd
-
-echo "Website update done"
-
 # Checkout develop branch
 echo "Checking out develop branch..."
 git checkout $DEVELOP
 
-echo "Done!"
+echo "Done!"

changelog.json

@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright (c) 2010 - 2015 Ushahidi Inc
+  ~ All rights reserved
+  ~ Contact: [email protected]
+  ~ Website: http://www.ushahidi.com
+  ~ GNU Lesser General Public License Usage
+  ~ This file may be used under the terms of the GNU Lesser
+  ~ General Public License version 3 as published by the Free Software
+  ~ Foundation and appearing in the file LICENSE.LGPL included in the
+  ~ packaging of this file. Please review the following information to
+  ~ ensure the GNU Lesser General Public License version 3 requirements
+  ~ will be met: http://www.gnu.org/licenses/lgpl.html.
+  ~
+  ~ If you have questions regarding the use of this file, please contact
+  ~ Ushahidi developers at [email protected].
+  -->
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+    <string name="app_name">SMSsync - Debug</string>
+</resources>

contributors.json

@@ -112,13 +112,16 @@ android {
     }
 
     defaultConfig {
-        versionCode 32
-        versionName "2.8.0"
+        versionCode 33
+        versionName "2.8.1"
         minSdkVersion 8
         targetSdkVersion 22
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        def publicKey = project.hasProperty('inAppPurchasePubKey') ? inAppPurchasePubKey : '';
-
+        def publicKey = project.hasProperty('inAppPurchasePubKey') ? inAppPurchasePubKey :
+                'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAogSL6I/lnQ0bVEEwttOu8CmrZvZzkTrFcsLiHjeb6Sw01+i8nTNW70QsTe1U2Hg4ELv3Hrm0Vt5gyQL2r9V4h8IWhbGNlHPAWJFP/dUgbwYFBUsJ4SSOS4N2kN9FER0mWwZ90boulNaHd8g8AQkwaBAzsNL5w+uij4hfZ9AsAO/rdhqXkAQeV6ykVgW0Q9qoWTcPg0ly7lOtxMmnvPFnrPXTt/SyoZEmNE5j02sh0eDdyGR5hEc16ZcMM2tvndRomfi+aYeswguZf3V+J+fAcXiBiX4Q81356g+nFJfMUxu8D7o0ZDPSS2u4FW79QhRjWzijJ/4EIw4TQ1jtKBapgwIDAQAB';
+        if (!project.hasProperty('inAppPurchasePubKey')) {
+            println 'Missing inAppPurchasePubKey. Using the default from SMSsync project'
+        }
         buildConfigField "String", "PUBLIC_LICENSE_KEY", '"' + publicKey + '"'
     }
 
@@ -148,18 +151,22 @@ android {
     productFlavors {
 
         withAnalytics {
-            flavorDimension "analytics"
+            dimension "analytics"
         }
 
         noAnalytics {
-            flavorDimension "analytics"
+            dimension "analytics"
         }
     }
 
     dexOptions {
         // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
         preDexLibraries = preDexEnabled && !isTravis
     }
+
+    packagingOptions {
+        exclude 'LICENSE.txt'
+    }
 }
 
 release {
@@ -202,7 +209,7 @@ tasks.release.dependsOn(['build', 'publishApkWithAnalyticsRelease'])
 
 // Build and launch app from command line
 task runApp(type: Exec, dependsOn: ['build', 'installWithAnalyticsDebug']) {
-    //Linux command to launch the PostActivity when debug app is installed
+    //Linux command to launch the MainActivity when debug app is installed
     commandLine 'adb', 'shell', 'am', 'start', '-n',
             'org.addhen.smssync.debug/org.addhen.smssync.activities.MainActivity'
 }

release.sh

@@ -60,6 +60,9 @@ public class SmssyncResponseTest extends BaseTest {
             + "    }\n"
             + "}";
 
+    private final String TASK_JSON_STRING
+            = "{\"payload\":{\"task\":\"send\",\"secret\":\"coconut\",\"messages\":[{\"to\":\"+XXXXXXXX\",\"message\":\"from couch to you homes\",\"uuid\":\"aeefa9195f734d32b7e0f9d62d327f6d\"}]}}";
+
     private Gson mGson;
 
     private SmssyncResponse mSmssyncResponse;
@@ -68,7 +71,6 @@ public class SmssyncResponseTest extends BaseTest {
     public void setUp() throws Exception {
         super.setUp();
         mGson = new Gson();
-
     }
 
     @SmallTest
@@ -97,4 +99,20 @@ public void testShouldDeserializeSmsResponseWithNoMessage() throws Exception {
         assertNull(mSmssyncResponse.getPayload().getMessages());
         System.out.println("messages:" + mSmssyncResponse.toString());
     }
+
+    @SmallTest
+    public void testShouldSerializeTaskResponseWithNoSuccessProperty() throws Exception {
+        mSmssyncResponse = mGson.fromJson(TASK_JSON_STRING, SmssyncResponse.class);
+        assertNotNull(mSmssyncResponse);
+        assertNotNull(mSmssyncResponse.getPayload());
+        assertEquals("send", mSmssyncResponse.getPayload().getTask());
+        assertEquals("coconut", mSmssyncResponse.getPayload().getSecret());
+        assertNotNull(mSmssyncResponse.getPayload().getMessages());
+        assertEquals("+XXXXXXXX",
+                mSmssyncResponse.getPayload().getMessages().get(0).getPhoneNumber());
+        assertEquals("from couch to you homes",
+                mSmssyncResponse.getPayload().getMessages().get(0).getBody());
+        assertEquals("aeefa9195f734d32b7e0f9d62d327f6d",
+                mSmssyncResponse.getPayload().getMessages().get(0).getUuid());
+    }
 }