From 53c0f01988566ed0d20a5f47908a961f2301268e Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@gmail.com>
Date: Sat, 3 Jun 2017 12:06:51 +0200
Subject: [PATCH] Introduce app_version_suffix

---
 OsmAnd/build.gradle                     | 16 ++++++++--------
 OsmAnd/no_translate.xml                 | 10 +++++-----
 OsmAnd/src/net/osmand/plus/Version.java |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index ce3b19de24..e0f90f3b31 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -1,11 +1,11 @@
 apply plugin: 'com.android.application'
 // Global Parameters accepted
+// TARGET_APP_NAME    - app name
 // APK_NUMBER_VERSION - version number of apk
-// APK_VERSION - build number like #9999Z, for dev builds appended to app_version like 2.0.0 in no_translate.xml)
-//               flavor                 Z : M=-master, D=-design, B=-Blackberry, MD=-main-default, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
-// TARGET_APP_NAME - app name
-// APP_EDITION - date stamp of builds
-// APP_FEATURES - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
+// APK_VERSION_SUFFIX - build number like #99999Z   (for dev builds only)
+//                      flavor                  Z : M=-master, D=-design, B=-Blackberry, MD=-main-default, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
+// APP_EDITION        - date stamp of builds
+// APP_FEATURES       - features +play_market +gps_status -parking_plugin -blackberry -free_version -amazon
 
 // 1. To be done Filter fonts
 // <unzip src="OsmAndCore_android.aar" dest=".">
@@ -186,10 +186,10 @@ def replaceNoTranslate(line) {
 //	if (line.contains("\"app_version\"") && System.getenv("APK_VERSION")) {
 //		return line.replaceAll(">[^<]*<", ">" + System.getenv("APK_VERSION") + "<")
 //	}
-//	if (line.contains("\"app_version\"") && System.getenv("APK_VERSION_SUFFIX")) {
+	if (line.contains("\"app_version_suffix\"") && System.getenv("APK_VERSION_SUFFIX")) {
 		// appends build number to version number for dev builds
-//		return line.replaceAll("</", System.getenv("APK_VERSION_SUFFIX") + "</")
-//	}
+		return line.replaceAll("</", System.getenv("APK_VERSION_SUFFIX") + "</")
+	}
 	if (line.contains("\"versionFeatures\"") && System.getenv("APP_FEATURES")) {
 		return line.replaceAll(">[^<]*<", ">" + System.getenv("APP_FEATURES") + "<")
 	}
diff --git a/OsmAnd/no_translate.xml b/OsmAnd/no_translate.xml
index 9e99fcf9e2..d0f9cffaa7 100644
--- a/OsmAnd/no_translate.xml
+++ b/OsmAnd/no_translate.xml
@@ -2,12 +2,12 @@
 <resources>
     <string name="app_name">OsmAnd~</string>
     <string name="app_name_free">OsmAndF~</string>
+    <string name="app_version_suffix"></string>
     <!--
-    Note: For our dev build apk's, the above "app_version" is provided (via osmand/build.xml) as the base version prefix to our build number in the format:
-             X.X.X#YYYYZ , where
-             X.X.X         is the above base (released) "app_version",
-                   YYYY    is the build number of build branch Z
-                       Z : M=-master, D=-main-default, B=-Blackberry, Des=-design, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
+    Note: appVersion will be concatenated via Manifest's "android:versionName" ("X.X.X") and the build info "app_version_suffix" ("#YYYYYZ" for dev builds only) as follows:
+             X.X.X#YYYYYZ , where
+                   YYYYY    is the build number of build branch Z
+                        Z : M=-master, D=-main-default, B=-Blackberry, Des=-design, MQA=-main-qt-arm, MQDA=-main-qt-default-arm, S=-sherpafy
     -->
 
     <!-- Not translatable -->
diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
index 1dba5a4f8e..82297f14f5 100644
--- a/OsmAnd/src/net/osmand/plus/Version.java
+++ b/OsmAnd/src/net/osmand/plus/Version.java
@@ -54,7 +54,7 @@ public class Version {
 		int versionCode = -1;
 		try {
 			PackageInfo packageInfo = ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0);
-			appVersion = packageInfo.versionName;
+			appVersion = packageInfo.versionName + ctx.getString(R.string.app_version_suffix);
 			versionCode = packageInfo.versionCode;
 		} catch (PackageManager.NameNotFoundException e) {
 			e.printStackTrace();