From 5a5de10959516c0325ea8292f0db432ab627c61a Mon Sep 17 00:00:00 2001
From: roelandp <248064+roelandp@users.noreply.github.com>
Date: Mon, 5 Oct 2020 14:39:25 +0200
Subject: [PATCH] differentiate config files to accomodate android versions for
 <8 and 8+

---
 tiapp.xml               |  19 ++++--
 tiapp_android_8plus.xml | 139 ++++++++++++++++++++++++++++++++++++++++
 tiapp_android_upto7.xml | 137 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 290 insertions(+), 5 deletions(-)
 create mode 100644 tiapp_android_8plus.xml
 create mode 100644 tiapp_android_upto7.xml

diff --git a/tiapp.xml b/tiapp.xml
index 42f82e1..4d5df43 100644
--- a/tiapp.xml
+++ b/tiapp.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+      ANDROID has issue with Ti.Inappbilling module.
+      Hence we export a version for Android support up
+      to ANDROID-7 (API-24) using 5.0.0 version of inappbilling
+
+      Android version code is prefixed with 070 in this case.
+ -->
 <ti:app
   xmlns:ti="http://ti.appcelerator.org">
   <id>app.steemwallet.roelandp</id>
   <name>HiveWallet</name>
-  <version>2.2.2.4</version>
+  <version>2.3.0.0</version>
   <publisher>roelandp</publisher>
   <url>https://hivewallet.app</url>
   <description>fast, secure and open source wallet for the Hive blockchain</description>
@@ -64,7 +71,7 @@
   <android
     xmlns:android="http://schemas.android.com/apk/res/android">
     <manifest
-      xmlns:android="http://schemas.android.com/apk/res/android" package="app.steemwallet.roelandp" android:versionCode="2225" android:versionName="2.2.2.5">
+      xmlns:android="http://schemas.android.com/apk/res/android" package="app.steemwallet.roelandp" android:versionCode="0702300" android:versionName="2.3.0.0">
       <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29"/>
       <application android:icon="@drawable/appicon" android:label="HiveWallet" android:name="HivewalletApplication" android:debuggable="false" android:theme="@style/Theme.MyTheme" android:resizeableActivity="true" android:allowBackup="false">
         <activity android:name=".HivewalletActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density" android:screenOrientation="portrait">
@@ -94,7 +101,8 @@
           </intent-filter>
         </activity>
         <provider android:name="org.appcelerator.titanium.io.TiFileProvider" android:authorities="app.steemwallet.roelandp.tifileprovider" android:exported="false" android:grantUriPermissions="true"/>
-        <uses-library android:name="org.apache.http.legacy" android:required="false" /> <!-- https://developers.google.com/maps/documentation/android-sdk/config#specify_requirement_for_apache_http_legacy_library --> 
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <!-- https://developers.google.com/maps/documentation/android-sdk/config#specify_requirement_for_apache_http_legacy_library -->
       </application>
     </manifest>
   </android>
@@ -106,7 +114,7 @@
     <module platform="iphone">ti.barcode</module>
     <module platform="android">ti.barcode</module>
     <module platform="iphone">ti.storekit</module>
-    <module platform="android">ti.inappbilling</module>
+    <module platform="android" version="5.0.0">ti.inappbilling</module>
     <module platform="android">ti.deeply</module>
     <!-- hyperloop only needed for android resume/pause function -->
     <module platform="android">hyperloop</module>
@@ -118,8 +126,9 @@
   </deployment-targets>
   <!-- ios for now -->
   <!-- <sdk-version>8.1.0.v20190605095601</sdk-version> -->
+  <sdk-version>8.3.1.GA</sdk-version>
   <!-- android for now -->
-  <sdk-version>7.4.1.GA</sdk-version>
+  <!-- <sdk-version>7.4.1.GA</sdk-version> -->
   <!-- <sdk-version>8.3.1.GA</sdk-version> -->
   <plugins>
     <plugin version="1.0">ti.alloy</plugin>
diff --git a/tiapp_android_8plus.xml b/tiapp_android_8plus.xml
new file mode 100644
index 0000000..d31f9d4
--- /dev/null
+++ b/tiapp_android_8plus.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+      ANDROID has issue with Ti.Inappbilling module.
+      Hence we export a version for Android support up
+      to API-7 using 5.0.0 version of inappbilling
+
+      This config file is for ANDROID-8 (API-26) and higher (minSdkVersion) - using 5.0.1 for inappbilling with a fix.
+
+      Android version code is prefixed with 080 in this case.
+ -->
+<ti:app
+  xmlns:ti="http://ti.appcelerator.org">
+  <id>app.steemwallet.roelandp</id>
+  <name>HiveWallet</name>
+  <version>2.3.0.0</version>
+  <publisher>roelandp</publisher>
+  <url>https://hivewallet.app</url>
+  <description>fast, secure and open source wallet for the Hive blockchain</description>
+  <copyright>2020 by roelandp</copyright>
+  <icon>appicon.png</icon>
+  <fullscreen>true</fullscreen>
+  <navbar-hidden>false</navbar-hidden>
+  <analytics>false</analytics>
+  <guid>da494d9d-d2a8-4f59-9aaa-f32b6372553f</guid>
+  <property name="ti.ui.defaultunit" type="string">dp</property>
+  <property name="run-on-main-thread" type="bool">true</property>
+  <ios>
+    <enable-launch-screen-storyboard>true</enable-launch-screen-storyboard>
+    <use-app-thinning>true</use-app-thinning>
+    <plist>
+      <dict>
+        <key>UISupportedInterfaceOrientations~iphone</key>
+        <array>
+          <string>UIInterfaceOrientationPortrait</string>
+          <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+        <key>UISupportedInterfaceOrientations~ipad</key>
+        <array>
+          <string>UIInterfaceOrientationPortrait</string>
+          <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+        <key>UIRequiresPersistentWiFi</key>
+        <false/>
+        <key>UIPrerenderedIcon</key>
+        <false/>
+        <key>UIStatusBarHidden</key>
+        <false/>
+        <key>UIStatusBarStyle</key>
+        <string>UIStatusBarStyleDefault</string>
+        <key>NSFaceIDUsageDescription</key>
+        <string>Unlock your wallet</string>
+        <key>NSCameraUsageDescription</key>
+        <string>Scan QR codes</string>
+        <key>NSPhotoLibraryUsageDescription</key>
+        <string>Read QR codes</string>
+        <key>CFBundleURLTypes</key>
+        <array>
+          <dict>
+            <key>CFBundleURLName</key>
+            <string>app.steemwallet.roelandp</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+              <string>hivewallet</string>
+              <string>hive</string>
+              <string>steemwallet</string>
+              <string>steem</string>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </plist>
+  </ios>
+  <android
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <manifest
+      xmlns:android="http://schemas.android.com/apk/res/android" package="app.steemwallet.roelandp" android:versionCode="0802300" android:versionName="2.3.0.0">
+      <uses-sdk android:minSdkVersion="26" android:targetSdkVersion="29"/>
+      <application android:icon="@drawable/appicon" android:label="HiveWallet" android:name="HivewalletApplication" android:debuggable="false" android:theme="@style/Theme.MyTheme" android:resizeableActivity="true" android:allowBackup="false">
+        <activity android:name=".HivewalletActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density" android:screenOrientation="portrait">
+          <intent-filter>
+            <action android:name="android.intent.action.MAIN"/>
+            <category android:name="android.intent.category.LAUNCHER"/>
+          </intent-filter>
+        </activity>
+        <activity android:name="org.appcelerator.titanium.TiActivity" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density" android:screenOrientation="portrait"/>
+        <activity android:name="org.appcelerator.titanium.TiTranslucentActivity" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density" android:theme="@style/Theme.Titanium.Translucent" android:screenOrientation="portrait"/>
+        <activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity" android:configChanges="screenSize|density" android:screenOrientation="portrait"/>
+        <activity android:name="ti.deeply.DeepLinkHandlerActivity" android:noHistory="true" android:excludeFromRecents="true" android:theme="@android:style/Theme.NoDisplay" launchMode="singleTask">
+          <intent-filter>
+            <action android:name="android.intent.action.VIEW"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+            <category android:name="android.intent.category.BROWSABLE"/>
+            <data android:scheme="steem"/>
+            <data android:scheme="steemwallet"/>
+            <data android:scheme="hive"/>
+            <data android:scheme="hivewallet"/>
+          </intent-filter>
+          <intent-filter android:autoVerify="true">
+            <action android:name="android.intent.action.VIEW"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+            <category android:name="android.intent.category.BROWSABLE"/>
+            <data android:scheme="https" android:host="hivewallet.app" android:pathPrefix="/sign"/>
+          </intent-filter>
+        </activity>
+        <provider android:name="org.appcelerator.titanium.io.TiFileProvider" android:authorities="app.steemwallet.roelandp.tifileprovider" android:exported="false" android:grantUriPermissions="true"/>
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <!-- https://developers.google.com/maps/documentation/android-sdk/config#specify_requirement_for_apache_http_legacy_library -->
+      </application>
+    </manifest>
+  </android>
+  <modules>
+    <module platform="iphone">ti.identity</module>
+    <module platform="android">ti.identity</module>
+    <module platform="iphone">av.imageview</module>
+    <module platform="android">av.imageview</module>
+    <module platform="iphone">ti.barcode</module>
+    <module platform="android">ti.barcode</module>
+    <module platform="iphone">ti.storekit</module>
+    <module platform="android" version="5.0.1">ti.inappbilling</module>
+    <module platform="android">ti.deeply</module>
+    <!-- hyperloop only needed for android resume/pause function -->
+    <module platform="android">hyperloop</module>
+  </modules>
+  <deployment-targets>
+    <target device="android">true</target>
+    <target device="ipad">true</target>
+    <target device="iphone">true</target>
+  </deployment-targets>
+  <!-- ios for now -->
+  <!-- <sdk-version>8.1.0.v20190605095601</sdk-version> -->
+  <sdk-version>8.3.1.GA</sdk-version>
+  <!-- android for now -->
+  <!-- <sdk-version>7.4.1.GA</sdk-version> -->
+  <!-- <sdk-version>8.3.1.GA</sdk-version> -->
+  <plugins>
+    <plugin version="1.0">ti.alloy</plugin>
+  </plugins>
+  <property name="appc-app-id" type="string">5b645230a27f9503eeb9b6d7</property>
+</ti:app>
diff --git a/tiapp_android_upto7.xml b/tiapp_android_upto7.xml
new file mode 100644
index 0000000..4d5df43
--- /dev/null
+++ b/tiapp_android_upto7.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+      ANDROID has issue with Ti.Inappbilling module.
+      Hence we export a version for Android support up
+      to ANDROID-7 (API-24) using 5.0.0 version of inappbilling
+
+      Android version code is prefixed with 070 in this case.
+ -->
+<ti:app
+  xmlns:ti="http://ti.appcelerator.org">
+  <id>app.steemwallet.roelandp</id>
+  <name>HiveWallet</name>
+  <version>2.3.0.0</version>
+  <publisher>roelandp</publisher>
+  <url>https://hivewallet.app</url>
+  <description>fast, secure and open source wallet for the Hive blockchain</description>
+  <copyright>2020 by roelandp</copyright>
+  <icon>appicon.png</icon>
+  <fullscreen>true</fullscreen>
+  <navbar-hidden>false</navbar-hidden>
+  <analytics>false</analytics>
+  <guid>da494d9d-d2a8-4f59-9aaa-f32b6372553f</guid>
+  <property name="ti.ui.defaultunit" type="string">dp</property>
+  <property name="run-on-main-thread" type="bool">true</property>
+  <ios>
+    <enable-launch-screen-storyboard>true</enable-launch-screen-storyboard>
+    <use-app-thinning>true</use-app-thinning>
+    <plist>
+      <dict>
+        <key>UISupportedInterfaceOrientations~iphone</key>
+        <array>
+          <string>UIInterfaceOrientationPortrait</string>
+          <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+        <key>UISupportedInterfaceOrientations~ipad</key>
+        <array>
+          <string>UIInterfaceOrientationPortrait</string>
+          <string>UIInterfaceOrientationPortraitUpsideDown</string>
+        </array>
+        <key>UIRequiresPersistentWiFi</key>
+        <false/>
+        <key>UIPrerenderedIcon</key>
+        <false/>
+        <key>UIStatusBarHidden</key>
+        <false/>
+        <key>UIStatusBarStyle</key>
+        <string>UIStatusBarStyleDefault</string>
+        <key>NSFaceIDUsageDescription</key>
+        <string>Unlock your wallet</string>
+        <key>NSCameraUsageDescription</key>
+        <string>Scan QR codes</string>
+        <key>NSPhotoLibraryUsageDescription</key>
+        <string>Read QR codes</string>
+        <key>CFBundleURLTypes</key>
+        <array>
+          <dict>
+            <key>CFBundleURLName</key>
+            <string>app.steemwallet.roelandp</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+              <string>hivewallet</string>
+              <string>hive</string>
+              <string>steemwallet</string>
+              <string>steem</string>
+            </array>
+          </dict>
+        </array>
+      </dict>
+    </plist>
+  </ios>
+  <android
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <manifest
+      xmlns:android="http://schemas.android.com/apk/res/android" package="app.steemwallet.roelandp" android:versionCode="0702300" android:versionName="2.3.0.0">
+      <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="29"/>
+      <application android:icon="@drawable/appicon" android:label="HiveWallet" android:name="HivewalletApplication" android:debuggable="false" android:theme="@style/Theme.MyTheme" android:resizeableActivity="true" android:allowBackup="false">
+        <activity android:name=".HivewalletActivity" android:label="@string/app_name" android:theme="@style/Theme.Titanium" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density" android:screenOrientation="portrait">
+          <intent-filter>
+            <action android:name="android.intent.action.MAIN"/>
+            <category android:name="android.intent.category.LAUNCHER"/>
+          </intent-filter>
+        </activity>
+        <activity android:name="org.appcelerator.titanium.TiActivity" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density" android:screenOrientation="portrait"/>
+        <activity android:name="org.appcelerator.titanium.TiTranslucentActivity" android:configChanges="keyboardHidden|orientation|fontScale|screenSize|smallestScreenSize|screenLayout|density" android:theme="@style/Theme.Titanium.Translucent" android:screenOrientation="portrait"/>
+        <activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity" android:configChanges="screenSize|density" android:screenOrientation="portrait"/>
+        <activity android:name="ti.deeply.DeepLinkHandlerActivity" android:noHistory="true" android:excludeFromRecents="true" android:theme="@android:style/Theme.NoDisplay" launchMode="singleTask">
+          <intent-filter>
+            <action android:name="android.intent.action.VIEW"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+            <category android:name="android.intent.category.BROWSABLE"/>
+            <data android:scheme="steem"/>
+            <data android:scheme="steemwallet"/>
+            <data android:scheme="hive"/>
+            <data android:scheme="hivewallet"/>
+          </intent-filter>
+          <intent-filter android:autoVerify="true">
+            <action android:name="android.intent.action.VIEW"/>
+            <category android:name="android.intent.category.DEFAULT"/>
+            <category android:name="android.intent.category.BROWSABLE"/>
+            <data android:scheme="https" android:host="hivewallet.app" android:pathPrefix="/sign"/>
+          </intent-filter>
+        </activity>
+        <provider android:name="org.appcelerator.titanium.io.TiFileProvider" android:authorities="app.steemwallet.roelandp.tifileprovider" android:exported="false" android:grantUriPermissions="true"/>
+        <uses-library android:name="org.apache.http.legacy" android:required="false"/>
+        <!-- https://developers.google.com/maps/documentation/android-sdk/config#specify_requirement_for_apache_http_legacy_library -->
+      </application>
+    </manifest>
+  </android>
+  <modules>
+    <module platform="iphone">ti.identity</module>
+    <module platform="android">ti.identity</module>
+    <module platform="iphone">av.imageview</module>
+    <module platform="android">av.imageview</module>
+    <module platform="iphone">ti.barcode</module>
+    <module platform="android">ti.barcode</module>
+    <module platform="iphone">ti.storekit</module>
+    <module platform="android" version="5.0.0">ti.inappbilling</module>
+    <module platform="android">ti.deeply</module>
+    <!-- hyperloop only needed for android resume/pause function -->
+    <module platform="android">hyperloop</module>
+  </modules>
+  <deployment-targets>
+    <target device="android">true</target>
+    <target device="ipad">true</target>
+    <target device="iphone">true</target>
+  </deployment-targets>
+  <!-- ios for now -->
+  <!-- <sdk-version>8.1.0.v20190605095601</sdk-version> -->
+  <sdk-version>8.3.1.GA</sdk-version>
+  <!-- android for now -->
+  <!-- <sdk-version>7.4.1.GA</sdk-version> -->
+  <!-- <sdk-version>8.3.1.GA</sdk-version> -->
+  <plugins>
+    <plugin version="1.0">ti.alloy</plugin>
+  </plugins>
+  <property name="appc-app-id" type="string">5b645230a27f9503eeb9b6d7</property>
+</ti:app>