Merge pull request #12 from fiskaltrust/user/tsc/extract-libs-in-apk

Include extractNativeLibs, update packages
fiskaltrust · Oct 22, 2020 · 3c63fb3 · 3c63fb3
2 parents 9939752 + e5c4f32
commit 3c63fb3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/src/fiskaltrust.AndroidLauncher/AndroidService/MiddlewareLauncherService.cs b/src/fiskaltrust.AndroidLauncher/AndroidService/MiddlewareLauncherService.cs
@@ -141,12 +141,15 @@ private static Notification GetNotification(LauncherState state, string contentT
 
         private static void CreateNotificationChannel()
         {
-            var channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, "fiskaltrust Middleware", NotificationImportance.Default)
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
             {
-                Description = "The fiskaltrust Middleware"
-            };
-            var manager = (NotificationManager)Application.Context.GetSystemService(NotificationService);
-            manager.CreateNotificationChannel(channel);
+                var channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, "fiskaltrust Middleware", NotificationImportance.Default)
+                {
+                    Description = "The fiskaltrust Middleware"
+                };
+                var manager = (NotificationManager)Application.Context.GetSystemService(NotificationService);
+                manager.CreateNotificationChannel(channel);
+            }
         }
 
         private static bool IsRunning(Type type)

diff --git a/src/fiskaltrust.AndroidLauncher/Properties/AndroidManifest.xml b/src/fiskaltrust.AndroidLauncher/Properties/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="eu.fiskaltrust.androidlauncher" android:installLocation="auto">
 	<uses-sdk android:minSdkVersion="24" android:targetSdkVersion="29" />
-	<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"></application>
+	<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme" android:extractNativeLibs="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 	<uses-permission android:name="android.permission.INTERNET" />

diff --git a/src/fiskaltrust.AndroidLauncher/fiskaltrust.AndroidLauncher.csproj b/src/fiskaltrust.AndroidLauncher/fiskaltrust.AndroidLauncher.csproj
@@ -53,7 +53,7 @@
     <AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
     <AndroidLinkMode>None</AndroidLinkMode>
     <EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
-    <LangVersion>8.0</LangVersion>    
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -131,7 +131,7 @@
       <Version>15.0.6</Version>
     </PackageReference>
     <PackageReference Include="fiskaltrust.Exports.DSFinVK">
-      <Version>1.0.0</Version>
+      <Version>1.0.1</Version>
     </PackageReference>
     <PackageReference Include="fiskaltrust.interface">
       <Version>1.3.1</Version>
@@ -140,7 +140,7 @@
       <Version>1.3.3</Version>
     </PackageReference>
     <PackageReference Include="fiskaltrust.Middleware.Helper.Helipad">
-      <Version>1.3.2</Version>
+      <Version>1.3.8</Version>
     </PackageReference>
     <PackageReference Include="fiskaltrust.Middleware.Interface.Client.Grpc">
       <Version>1.3.3</Version>
@@ -152,10 +152,10 @@
       <Version>1.3.6-rc1</Version>
     </PackageReference>
     <PackageReference Include="fiskaltrust.Middleware.SCU.DE.Swissbit">
-      <Version>1.3.9</Version>
+      <Version>1.3.10</Version>
     </PackageReference>
     <PackageReference Include="fiskaltrust.Middleware.SCU.DE.SwissbitAndroid">
-      <Version>1.3.9-rc1</Version>
+      <Version>1.3.10</Version>
     </PackageReference>
     <PackageReference Include="Grpc.Core">
       <Version>2.31.0</Version>

diff --git a/version.json b/version.json
@@ -1,5 +1,5 @@
 {
-    "version": "1.3.9-rc4",
+    "version": "1.3.9-rc5",
     "releaseBranches": [
       "^refs/heads/master$",
       "^refs/heads/release/\\d+(?:\\.\\d+)*(?:-.*)?$",