From 6fe18f6a466dbae611bbe1e4fa33b352cc4ef6df Mon Sep 17 00:00:00 2001
From: Angelo Mantellini <manangel@cisco.com>
Date: Wed, 12 Jun 2019 18:02:19 +0200
Subject: Correct android issues for libdash and viper

Change-Id: Ia5b95bda6336b6544c881c416f852069662f5e3f
Signed-off-by: Angelo Mantellini <manangel@cisco.com>
---
 android/AndroidManifest.xml                     |   6 +--
 android/gradle.properties                       |   4 +-
 android/res/drawable-hdpi/icon.png              | Bin 2449 -> 127864 bytes
 android/res/drawable-ldpi/icon.png              | Bin 1285 -> 127864 bytes
 android/res/drawable-mdpi/icon.png              | Bin 1777 -> 114093 bytes
 android/src/io/fd/viper/ViperActivity.java      |  51 ++++++++++++++++++++++++
 android/src/org/player/viper/ViperActivity.java |  51 ------------------------
 7 files changed, 56 insertions(+), 56 deletions(-)
 mode change 100755 => 100644 android/res/drawable-hdpi/icon.png
 mode change 100755 => 100644 android/res/drawable-ldpi/icon.png
 mode change 100755 => 100644 android/res/drawable-mdpi/icon.png
 create mode 100755 android/src/io/fd/viper/ViperActivity.java
 delete mode 100755 android/src/org/player/viper/ViperActivity.java

(limited to 'android')

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index aaac206d..f8e00c3a 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<manifest package="org.player.viper" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="7" android:installLocation="auto">
+<manifest package="io.fd.viper" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="9" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Viper" android:icon="@drawable/icon">
-        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.player.viper.ViperActivity" android:label="Viper" android:screenOrientation="unspecified" android:launchMode="singleTop">
+        <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="io.fd.viper.ViperActivity" android:label="Viper" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -69,7 +69,7 @@
 
     </application>
 
-    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="23"/>
+    <uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
diff --git a/android/gradle.properties b/android/gradle.properties
index 5582cc87..8527bcaf 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -3,6 +3,6 @@
 # This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 
-androidBuildToolsVersion=23.0.2
-androidCompileSdkVersion=23
+androidBuildToolsVersion=28.0.3
+androidCompileSdkVersion=28
 buildDir=.build
diff --git a/android/res/drawable-hdpi/icon.png b/android/res/drawable-hdpi/icon.png
old mode 100755
new mode 100644
index ecd7fe96..d84d1df6
Binary files a/android/res/drawable-hdpi/icon.png and b/android/res/drawable-hdpi/icon.png differ
diff --git a/android/res/drawable-ldpi/icon.png b/android/res/drawable-ldpi/icon.png
old mode 100755
new mode 100644
index 8a4388e5..d84d1df6
Binary files a/android/res/drawable-ldpi/icon.png and b/android/res/drawable-ldpi/icon.png differ
diff --git a/android/res/drawable-mdpi/icon.png b/android/res/drawable-mdpi/icon.png
old mode 100755
new mode 100644
index a1519295..812c295f
Binary files a/android/res/drawable-mdpi/icon.png and b/android/res/drawable-mdpi/icon.png differ
diff --git a/android/src/io/fd/viper/ViperActivity.java b/android/src/io/fd/viper/ViperActivity.java
new file mode 100755
index 00000000..0696d0d0
--- /dev/null
+++ b/android/src/io/fd/viper/ViperActivity.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2017 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.fd.viper;
+import org.qtproject.qt5.android.bindings.QtActivity;
+import android.content.Context;
+import android.content.Intent;
+import android.app.PendingIntent;
+import android.util.Log;
+import android.os.Bundle;
+import android.view.WindowManager;
+import android.content.pm.ActivityInfo;
+
+public class ViperActivity extends QtActivity
+{
+    private final static String TAG = "ViperPlayer";
+    private static String m_request_url;
+    private static ViperActivity m_instance;
+    public ViperActivity() {
+        m_instance = this;
+    }
+    public static String getUrl() {
+        return m_instance.m_request_url;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        Intent intent = getIntent();
+        String action = intent.getAction();
+
+        if (intent.ACTION_VIEW.equals(action)) {
+            m_request_url = intent.getDataString();
+        }
+        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+    }
+}
diff --git a/android/src/org/player/viper/ViperActivity.java b/android/src/org/player/viper/ViperActivity.java
deleted file mode 100755
index e046d125..00000000
--- a/android/src/org/player/viper/ViperActivity.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2017 Cisco and/or its affiliates.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.player.viper;
-import org.qtproject.qt5.android.bindings.QtActivity;
-import android.content.Context;
-import android.content.Intent;
-import android.app.PendingIntent;
-import android.util.Log;
-import android.os.Bundle;
-import android.view.WindowManager;
-import android.content.pm.ActivityInfo;
-
-public class ViperActivity extends QtActivity
-{
-    private final static String TAG = "ViperPlayer";
-    private static String m_request_url;
-    private static ViperActivity m_instance;
-    public ViperActivity() {
-        m_instance = this;
-    }
-    public static String getUrl() {
-        return m_instance.m_request_url;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-        Intent intent = getIntent();
-        String action = intent.getAction();
-
-        if (intent.ACTION_VIEW.equals(action)) {
-            m_request_url = intent.getDataString();
-        }
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-    }
-}
-- 
cgit 1.2.3-korg