Merge pull request #186 from senseobservationsystems/hotfix/multi_language_reset_password

Hotfix/multi language reset password

Author: Ted Schmidt

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v3.5.1 (2016-01-11)
+
+### Added
+* New parameter language in reset password request
+
 ## v3.4.2 (2015-05-13)
 
 ### Fixed

sense-android-library/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="nl.sense_os.service"
-    android:versionName="3.5.0">
+    android:versionName="3.5.1">
     <!-- <uses-sdk -->
     <uses-sdk android:minSdkVersion="9" tools:overrideLibrary="com.google.android.gms"/>
 

sense-android-library/src/nl/sense_os/service/commonsense/SenseApi.java

@@ -1277,6 +1277,26 @@ public static boolean resetPassword(Context context, String email) throws IOExce
      */
     public static boolean resetPasswordRequest(Context context, String username) throws IOException,
             JSONException {
+        return resetPasswordRequest(context, username, Locale.US);
+    }
+
+    /**
+     * Request a password reset for the given username.
+     * 
+     * @param context
+     *            Application context, used for getting preferences.
+     * @param email
+     *            Email address for the account that you want to regain access to.
+     * @param language
+     *            Language the reset password email will be send as
+     * @return <code>true</code> if the request wasw accepted
+     * @throws IOException
+     *             In case of communication failure to CommonSense
+     * @throws JSONException
+     *             In case of unparseable response from CommonSense
+     */
+    public static boolean resetPasswordRequest(Context context, String username, Locale language) throws IOException,
+            JSONException {
 
         if (null == sMainPrefs) {
             sMainPrefs = context.getSharedPreferences(SensePrefs.MAIN_PREFS, Context.MODE_PRIVATE);
@@ -1287,6 +1307,7 @@ public static boolean resetPasswordRequest(Context context, String username) thr
         String url = devMode ? SenseUrls.RESET_PASSWORD_REQUEST_DEV : SenseUrls.RESET_PASSWORD_REQUEST;
         JSONObject content = new JSONObject();
         content.put("username", username);
+        content.put("language", language.toString());
 
         // TODO disable compressed 
         Boolean useCompressed = sMainPrefs.getBoolean(SensePrefs.Main.Advanced.COMPRESS, false);

sense-android-library/src/nl/sense_os/service/phonestate/AppInfoVersion.java

@@ -2,6 +2,6 @@
 
 public abstract class AppInfoVersion { 
 
-	public final static String SENSE_LIBRARY_VERSION = "v3.4.2";
+	public final static String SENSE_LIBRARY_VERSION = "v3.5.1";
 	public final static String CORTEX_VERSION = "";
 }