Update AssetsDownloader.cs

.github/workflows/build.yml

@@ -2,9 +2,9 @@ name: Build
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "dev" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "dev" ]
   workflow_dispatch: {}
 
 jobs:
@@ -45,19 +45,20 @@ jobs:
         with:
           targetPlatform: Android
           allowDirtyBuild: true
+          buildName: "HooverHighQuestAppLauncher-DEV"
 
       # Output
       - name: Upload build
         uses: softprops/action-gh-release@v1
         with:
-          files: build/
+          files: build/Android/*.apk
           token: ${{ secrets.GITHUB_TOKEN }}
-          tag_name: "1.0.0"
+          tag_name: "1.0.0-dev"
       
       # Upload dir
       - uses: actions/upload-artifact@v2
         with:
-          name: Build
+          name: Build-dev
           path: build
       
       # Return License

Assets/Plugins/Android/AndroidManifest.xml

@@ -10,6 +10,7 @@
         </intent-filter>
     </activity>
   </application>
+  <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
   <uses-feature android:name="android.hardware.vr.headtracking" android:required="false" android:version="1" />
   <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
-</manifest>
+</manifest>

Assets/Scenes/QuestAppLauncher.unity

@@ -20857,7 +20857,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2124784240
 RectTransform:
   m_ObjectHideFlags: 0
@@ -20934,7 +20934,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls:
       - m_Target: {fileID: 883330328}
-        m_MethodName: OpenSettings
+        m_MethodName: ""
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}

Assets/Scripts/AssetsDownloader.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -14,6 +14,55 @@ using Newtonsoft.Json.Linq;
 
 namespace QuestAppLauncher
 {
+    public class InstallAPK
+    {
+        private bool installApp(string apkPath)
+{
+    bool success = true;
+    //GameObject.Find("TextDebug").GetComponent<Text>().text = "Installing App";
+
+    try
+    {
+        //Get Activity then Context
+        AndroidJavaClass unityPlayer = new AndroidJavaClass("com.unity3d.player.UnityPlayer");
+        AndroidJavaObject currentActivity = unityPlayer.GetStatic<AndroidJavaObject>("currentActivity");
+        AndroidJavaObject unityContext = currentActivity.Call<AndroidJavaObject>("getApplicationContext");
+
+        //Get the package Name
+        string packageName = unityContext.Call<string>("getPackageName");
+        string authority = packageName + ".fileprovider";
+
+        AndroidJavaClass intentObj = new AndroidJavaClass("android.content.Intent");
+        string ACTION_VIEW = intentObj.GetStatic<string>("ACTION_VIEW");
+        AndroidJavaObject intent = new AndroidJavaObject("android.content.Intent", ACTION_VIEW);
+
+
+        int FLAG_ACTIVITY_NEW_TASK = intentObj.GetStatic<int>("FLAG_ACTIVITY_NEW_TASK");
+        int FLAG_GRANT_READ_URI_PERMISSION = intentObj.GetStatic<int>("FLAG_GRANT_READ_URI_PERMISSION");
+
+        //File fileObj = new File(String pathname);
+        AndroidJavaObject fileObj = new AndroidJavaObject("java.io.File", apkPath);
+        //FileProvider object that will be used to call it static function
+        AndroidJavaClass fileProvider = new AndroidJavaClass("android.support.v4.content.FileProvider");
+        //getUriForFile(Context context, String authority, File file)
+        AndroidJavaObject uri = fileProvider.CallStatic<AndroidJavaObject>("getUriForFile", unityContext, authority, fileObj);
+
+        intent.Call<AndroidJavaObject>("setDataAndType", uri, "application/vnd.android.package-archive");
+        intent.Call<AndroidJavaObject>("addFlags", FLAG_ACTIVITY_NEW_TASK);
+        intent.Call<AndroidJavaObject>("addFlags", FLAG_GRANT_READ_URI_PERMISSION);
+        currentActivity.Call("startActivity", intent);
+
+        //GameObject.Find("TextDebug").GetComponent<Text>().text = "Success";
+    }
+    catch (System.Exception e)
+    {
+        //GameObject.Find("TextDebug").GetComponent<Text>().text = "Error: " + e.Message;
+        success = false;
+    }
+
+    return success;
+}
+    }
     /// <summary>
     /// Downloads assets (app icons packs and names files) from configured repos.
     /// </summary>
@@ -29,7 +78,12 @@ namespace QuestAppLauncher
         const string TempDownloadFileExtention = ".tmp_download";
 
         // GitHub API url
-        const string GithubApiUrl = @"http://api.github.com/repos/";
+        const string GithubApiUrl = @"http://api.github.com/";
+        
+        // If Github account is a org set this to true
+        public bool isorg = true;
+        
+        public string GithubUrl = "";
 
         // Rate limit in minutes
         const int RateLimitInMins = 5;
@@ -187,9 +241,9 @@ namespace QuestAppLauncher
             var configRepos = new HashSet<string>();
             foreach (var item in config.downloadRepos)
             {
-                if (null == item.type || !string.Equals(item.type, Config.DownloadRepo_Type_GitHub, StringComparison.OrdinalIgnoreCase))
+                if (null == item.type || !string.Equals(item.type, Config.DownloadRepo_Type_GitHub, StringComparison.OrdinalIgnoreCase) || !string.Equals(item.type, Config.DownloadRepo_Type_PrivUrl, StringComparison.OrdinalIgnoreCase))
                 {
-                    // For now, we only support GitHub repos
+                    // For now, we only support GitHub repos, or our private update url
                     continue;
                 }
 
@@ -294,7 +348,12 @@ namespace QuestAppLauncher
         private async Task<bool> GetAssetsInfoFromGithubRepoAsync(string repoUri,
             Dictionary<string, AssetInfo> assetsInfo, IDownloadProgress downloadProgress = null)
         {
-            var requestUrl = GithubApiUrl + repoUri;
+            if (isorg == true) {
+                GithubUrl = GithubApiUrl + "orgs/";
+            } else {
+                GithubUrl = GithubApiUrl;
+            }
+            var requestUrl = GithubUrl + repoUri;
             Debug.LogFormat("Reading assets from {0}", requestUrl);
 
             try

Assets/Scripts/Config.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
@@ -26,10 +26,11 @@ namespace QuestAppLauncher
 
         // Download repos
         public const string DownloadRepo_Type_GitHub = "github";
+        public const string DownloadRepo_Type_PrivUrl = "hhsupserver";
         public const string DownloadRepo_Default = @"hooverhigh/QuestAppLauncher_Assets/releases/latest";
 
         // Background
-        public const string Background_Default = "default";
+        public const string Background_Default = "background.jpg";
 
         /// <summary>
         /// Grid size
@@ -37,8 +38,8 @@ namespace QuestAppLauncher
         [Serializable]
         public class GridSize
         {
-            public int rows = 3;
-            public int cols = 3;
+            public int rows = 4;
+            public int cols = 4;
         }
 
         /// <summary>
@@ -61,7 +62,7 @@ namespace QuestAppLauncher
         public bool show2D = true;
 
         // Auto Category: Apps are automatically categorized into 3 tabs - Quest, Go/GearVr, 2D
-        public string autoCategory = Category_Top;
+        public string autoCategory = Category_Off;
 
         // Custom Category: Apps are categorized according to appnames.txt file
         public string customCategory = Category_Right;

ProjectSettings/ProjectSettings.asset

@@ -12,8 +12,8 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: AAA
-  productName: .Quest App Launcher
+  companyName: hooverhigh
+  productName: Quest App Launcher
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -165,8 +165,8 @@ PlayerSettings:
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
   applicationIdentifier:
-    Android: aaa.QuestAppLauncher.App
-    Standalone: com.DefaultCompany.QuestAppLauncher
+    Android: HooverHigh.QuestAppLauncher
+    Standalone: com.HooverHigh.QuestAppLauncher
   buildNumber: {}
   AndroidBundleVersionCode: 1
   AndroidMinSdkVersion: 25

README.md

@@ -1,6 +1,6 @@
 # Quest App Launcher
 
-[![Build](https://github.com/HooverHigh/QuestAppLauncher/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/HooverHigh/QuestAppLauncher/actions/workflows/build.yml)
+[![Build](https://github.com/HooverHigh/QuestAppLauncher/actions/workflows/build.yml/badge.svg?branch=dev)](https://github.com/HooverHigh/QuestAppLauncher/actions/workflows/build.yml)
 
 An app launcher for hoover high Oculus Quests, implemented in Unity.