Author: Masala <[email protected]>

Date: Sat Aug 13 05:42:34 2022 -0400 cmd/gogio: add android foreground permission This adds the permission android.permission.FOREGROUND_SERVICE to the android application Metadata Signed-off-by: Masala <[email protected]>
gioui · Aug 13, 2022 · 8acf798 · 8acf798
1 parent 2edf599
commit 8acf798
Show file tree

Hide file tree

Showing 2 changed files with 72 additions and 35 deletions.
diff --git a/gogio/androidbuild.go b/gogio/androidbuild.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"io/fs"
 	"io/ioutil"
 	"os"
 	"os/exec"
@@ -49,6 +50,7 @@ type manifestData struct {
 	Features    []string
 	IconSnip    string
 	AppName     string
+	HasService  bool
 }
 
 const (
@@ -146,9 +148,6 @@ func buildAndroid(tmpDir string, bi *buildInfo) error {
 		return err
 	}
 
-	if err := compileAndroid(tmpDir, tools, bi); err != nil {
-		return err
-	}
 	switch *buildMode {
 	case "archive":
 		return archiveAndroid(tmpDir, bi, perms)
@@ -248,6 +247,18 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
 	if err != nil {
 		return err
 	}
+
+	// walk tmpDir to find generated R.java that is generated from Manifest.xml
+	err = filepath.Walk(tmpDir, func(path string, info fs.FileInfo, err error) error {
+		if !info.IsDir() && filepath.Ext(info.Name()) == ".java" {
+			javaFiles = append(javaFiles, path)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+
 	if len(javaFiles) == 0 {
 		return fmt.Errorf("the gioui.org/app package contains no .java files (gioui.org module too old?)")
 	}
@@ -337,22 +348,6 @@ func archiveAndroid(tmpDir string, bi *buildInfo, perms []string) (err error) {
 }
 
 func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, perms []string, isBundle bool) (err error) {
-	classes := filepath.Join(tmpDir, "classes")
-	var classFiles []string
-	err = filepath.Walk(classes, func(path string, f os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if filepath.Ext(path) == ".class" {
-			classFiles = append(classFiles, path)
-		}
-		return nil
-	})
-	classFiles = append(classFiles, extraJars...)
-	dexDir := filepath.Join(tmpDir, "apk")
-	if err := os.MkdirAll(dexDir, 0755); err != nil {
-		return err
-	}
 	// https://developer.android.com/distribute/best-practices/develop/target-sdk
 	targetSDK := 31
 	if bi.minsdk > targetSDK {
@@ -362,22 +357,6 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
 	if bi.minsdk > minSDK {
 		minSDK = bi.minsdk
 	}
-	if len(classFiles) > 0 {
-		d8 := exec.Command(
-			filepath.Join(tools.buildtools, "d8"),
-			"--lib", tools.androidjar,
-			"--output", dexDir,
-			"--min-api", strconv.Itoa(minSDK),
-		)
-		d8.Args = append(d8.Args, classFiles...)
-		if _, err := runCmd(d8); err != nil {
-			major, minor, ok := determineJDKVersion()
-			if ok && (major != 1 || minor != 8) {
-				return fmt.Errorf("unsupported JDK version %d.%d, expected 1.8\nd8 error: %v", major, minor, err)
-			}
-			return err
-		}
-	}
 
 	// Compile resources.
 	resDir := filepath.Join(tmpDir, "res")
@@ -446,6 +425,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
 		Features:    features,
 		IconSnip:    iconSnip,
 		AppName:     appName,
+		HasService:  hasForegroundPermission(permissions),
 	}
 	tmpl, err := template.New("test").Parse(
 		`<?xml version="1.0" encoding="utf-8"?>
@@ -468,6 +448,11 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
 		</activity>
+		{{if .HasService}}
+		<service android:name="org.gioui.GioForegroundService"
+			android:stopWithTask="true">
+		</service>
+		{{end}}
 	</application>
 </manifest>`)
 	var manifestBuffer bytes.Buffer
@@ -486,6 +471,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
 		"--manifest", manifest,
 		"-I", tools.androidjar,
 		"-o", linkAPK,
+		"--java", tmpDir,
 	}
 	if isBundle {
 		args = append(args, "--proto-format")
@@ -496,6 +482,43 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
 		return err
 	}
 
+	if err := compileAndroid(tmpDir, tools, bi); err != nil {
+		return err
+	}
+
+	classes := filepath.Join(tmpDir, "classes")
+	var classFiles []string
+	err = filepath.Walk(classes, func(path string, f os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if filepath.Ext(path) == ".class" {
+			classFiles = append(classFiles, path)
+		}
+		return nil
+	})
+	classFiles = append(classFiles, extraJars...)
+	dexDir := filepath.Join(tmpDir, "apk")
+	if err := os.MkdirAll(dexDir, 0755); err != nil {
+		return err
+	}
+	if len(classFiles) > 0 {
+		d8 := exec.Command(
+			filepath.Join(tools.buildtools, "d8"),
+			"--lib", tools.androidjar,
+			"--output", dexDir,
+			"--min-api", strconv.Itoa(minSDK),
+		)
+		d8.Args = append(d8.Args, classFiles...)
+		if _, err := runCmd(d8); err != nil {
+			major, minor, ok := determineJDKVersion()
+			if ok && (major != 1 || minor != 8) {
+				return fmt.Errorf("unsupported JDK version %d.%d, expected 1.8\nd8 error: %v", major, minor, err)
+			}
+			return err
+		}
+	}
+
 	// The Go standard library archive/zip doesn't support appending to zip
 	// files. Copy files from `link.apk` (generated by aapt2) along with classes.dex and
 	// the Go libraries to a new `app.zip` file.
@@ -865,6 +888,17 @@ func getPermissions(ps []string) ([]string, []string) {
 	return permissions, features
 }
 
+func hasForegroundPermission(permissions []string) bool {
+	if fgPerms, ok := AndroidPermissions["foreground"]; ok {
+		for _, p := range permissions {
+			if p == fgPerms[0] { // []string, len 1
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func latestPlatform(sdk string) (string, error) {
 	allPlats, err := filepath.Glob(filepath.Join(sdk, "platforms", "android-*"))
 	if err != nil {

diff --git a/gogio/permission.go b/gogio/permission.go
@@ -22,6 +22,9 @@ var AndroidPermissions = map[string][]string{
 	"wakelock": {
 		"android.permission.WAKE_LOCK",
 	},
+	"foreground": {
+		"android.permission.FOREGROUND_SERVICE",
+	},
 }
 
 var AndroidFeatures = map[string][]string{