From 77900c69f31a86703d278040f11fb8caaa9e5457 Mon Sep 17 00:00:00 2001
From: A117870935 <surinder.kumar@t-systems.com>
Date: Thu, 18 May 2023 20:13:02 +0530
Subject: [PATCH] License, Build version configuration and User agent updated
 for the following branches: nmcfeat/1240-license-branding feature/NMCLOUD-703
 feature/NMC-1904

---
 LICENSE.txt      | 11 +++++++++++
 app/build.gradle | 22 ++++++++--------------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 4fc88098775c..74f1504175fd 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,3 +1,14 @@
+Although the code for this android client is free and available under the GPL2 license, Deutsche Telekom
+(including T-Systems) fully reserves all rights to the Telekom brand. To prevent users from getting confused about
+the source of a digital product or experience, there are stringent restrictions on using the Telekom brand and design,
+even when built into code that we provide. For any customization other than explicitly for Telekom or T-Systems, you must
+replace the Deutsche Telekom and T-Systems brand elements contained in the provided sources.
+
+To help you identify the brand elements, see:
+    ./drawable: folder contains brand-design specific icons or images
+    Brand-protected Magenta colour definitions are (unfortunately) spread over the source code.
+
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
diff --git a/app/build.gradle b/app/build.gradle
index c39047c91cc5..bf1bd794ce25 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -59,7 +59,7 @@ configurations.configureEach {
 }
 
 // semantic versioning for version code
-def versionMajor = 3
+def versionMajor = 7
 def versionMinor = 28
 def versionPatch = 0
 def versionBuild = 52 // 0-50=Alpha / 51-98=RC / 90-99=stable
@@ -105,15 +105,9 @@ android {
 
         multiDexEnabled true
 
-        versionCode versionMajor * 10000000 + versionMinor * 10000 + versionPatch * 100 + versionBuild
-
-        if (versionBuild > 89) {
-            versionName "${versionMajor}.${versionMinor}.${versionPatch}"
-        } else if (versionBuild > 50) {
-            versionName "${versionMajor}.${versionMinor}.${versionPatch} RC" + (versionBuild - 50)
-        } else {
-            versionName "${versionMajor}.${versionMinor}.${versionPatch} Alpha" + (versionBuild + 1)
-        }
+        //using short version number for more readability for NMC
+        versionCode Integer.parseInt("${versionMajor}${versionMinor}${versionPatch}")
+        versionName "${versionMajor}.${versionMinor}.${versionPatch}"
 
         // adapt structure from Eclipse to Gradle/Android Studio expectations;
         // see http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Configuring-the-Structure
@@ -150,15 +144,15 @@ android {
             versionDev {
                 applicationId "com.nextcloud.android.beta"
                 dimension "default"
-                versionCode 20220322
-                versionName "20220322"
+                versionCode 71200129
+                versionName "71200129"
             }
 
             qa {
                 applicationId "com.nextcloud.android.qa"
                 dimension "default"
-                versionCode 1
-                versionName "1"
+                versionCode 74
+                versionName "1.74"
             }
         }