2.5-android-1

core/c/mpw-types.c

@@ -143,12 +143,12 @@ const char **mpw_templatesForType(MPResultType type, size_t *count) {
         case MPResultTypeTemplateMedium:
             return mpw_alloc_array( count, const char *,
                     "CvcnoCvc", "CvcCvcno" );
-        case MPResultTypeTemplateBasic:
-            return mpw_alloc_array( count, const char *,
-                    "aaanaaan", "aannaaan", "aaannaaa" );
         case MPResultTypeTemplateShort:
             return mpw_alloc_array( count, const char *,
                     "Cvcn" );
+        case MPResultTypeTemplateBasic:
+            return mpw_alloc_array( count, const char *,
+                    "aaanaaan", "aannaaan", "aaannaaa" );
         case MPResultTypeTemplatePIN:
             return mpw_alloc_array( count, const char *,
                     "nnnn" );

gradle/README.md

@@ -0,0 +1,7 @@
+To build a release distribution:
+
+STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle assembleRelease
+
+Note:
+
+ - At the time of writing, Android does not build with JDK 9+.  As such, the above command must be ran with JAVA_HOME pointing to JDK 7-8.

gradle/build.gradle

@@ -22,7 +22,7 @@ buildscript {
     }
 
     dependencies {
-        classpath group: 'com.android.tools.build', name: 'gradle', version: '2.3.0'
+        classpath group: 'com.android.tools.build', name: 'gradle', version: '2.3.2'
     }
 }
 

gradle/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Sun Mar 26 09:11:08 EDT 2017
 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.3-bin.zip

gradle/gradlew

@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -155,7 +155,7 @@ if $cygwin ; then
 fi
 
 # Escape application args
-save ( ) {
+save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }

platform-android/README

@@ -1,13 +0,0 @@
-To build this module, please ensure you've done the following setup:
-
-1. Installed the Android SDK and fully downloaded the Android SDK platform 21 in it.
-2. Set the environment variable ANDROID_HOME in your shell or in ~/.mavenrc to point to the root of your Android SDK install.
-3. Installed the Android SDK into your Maven's local repository.
-    3a. Clone the maven-android-sdk-deployer available from here: https://github.com/mosabua/maven-android-sdk-deployer.git
-    3b. In the root of this project, run: mvn install -P 5.0
-
-To build this module:
-
-1. Build the parent, by going into 'MasterPassword/Java' and running: mvn clean install
-2. Build this module, by going into 'MasterPassword/Java/masterpassword-android' and running: mvn clean install
-3. You can then find the APK in: 'MasterPassword/Java/masterpassword-android/target'

platform-android/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId 'com.lyndir.masterpassword'
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 20401
-        versionName '2.4.1'
+        versionCode 20501
+        versionName '2.5.1'
     }
 
     // release with: STORE_PW=$(mpw masterpassword.keystore) KEY_PW=$(mpw masterpassword-android) gradle assembleRelease