Merge pull request #20 from codeskyblue/fix-19

fix parse of intent-filters, close #19

Author: shogo82148

.travis.yml

@@ -2,11 +2,6 @@ language: go
 sudo: false
 
 go:
-  - '1.3.x'
-  - '1.4.x'
-  - '1.5.x'
-  - '1.6.x'
-  - '1.7.x'
   - '1.8.x'
   - '1.9.x'
   - '1.10.x'

apk/apk.go

@@ -108,20 +108,30 @@ func (k *Apk) PackageName() string {
 	return k.manifest.Package
 }
 
-// MainActivty returns the name of the main activity.
+func isMainIntentFilter(intent ActivityIntentFilter) bool {
+	if intent.Action.Name != "android.intent.action.MAIN" {
+		return false
+	}
+	for _, category := range intent.Categories {
+		if category.Name == "android.intent.category.LAUNCHER" {
+			return true
+		}
+	}
+	return false
+}
+
+// MainActivity returns the name of the main activity.
 func (k *Apk) MainActivity() (activity string, err error) {
 	for _, act := range k.manifest.App.Activities {
 		for _, intent := range act.IntentFilters {
-			if intent.Action.Name == "android.intent.action.MAIN" &&
-				intent.Category.Name == "android.intent.category.LAUNCHER" {
+			if isMainIntentFilter(intent) {
 				return act.Name, nil
 			}
 		}
 	}
 	for _, act := range k.manifest.App.ActivityAliases {
 		for _, intent := range act.IntentFilters {
-			if intent.Action.Name == "android.intent.action.MAIN" &&
-				intent.Category.Name == "android.intent.category.LAUNCHER" {
+			if isMainIntentFilter(intent) {
 				return act.TargetActivity, nil
 			}
 		}

apk/apk_test.go

@@ -18,15 +18,15 @@ func TestGetIcon(t *testing.T) {
 
 	label, err := apk.Label(nil)
 	assert.NoError(t, err)
-	assert.Equal(t, label, "HelloWorld")
+	assert.Equal(t, "HelloWorld", label)
 	t.Log("app label:", label)
 
-	assert.Equal(t, apk.PackageName(), "com.example.helloworld")
+	assert.Equal(t, "com.example.helloworld", apk.PackageName())
 
 	manifest := apk.Manifest()
 	assert.Equal(t, manifest.SDK.Target, 24)
 
 	mainActivity, err := apk.MainActivity()
 	assert.NoError(t, err)
-	assert.Equal(t, mainActivity, "com.example.helloworld.MainActivity")
+	assert.Equal(t, "com.example.helloworld.MainActivity", mainActivity)
 }

apk/apkxml.go

@@ -20,8 +20,8 @@ type ActivityCategory struct {
 
 // ActivityIntentFilter is an intent filter of an activity.
 type ActivityIntentFilter struct {
-	Action   ActivityAction   `xml:"action"`
-	Category ActivityCategory `xml:"category"`
+	Action     ActivityAction     `xml:"action"`
+	Categories []ActivityCategory `xml:"category"`
 }
 
 // AppActivity is an activity in an application.

go.mod

@@ -0,0 +1,6 @@
+module github.com/shogo82148/androidbinary
+
+require (
+	github.com/pkg/errors v0.8.1
+	github.com/stretchr/testify v1.3.0
+)

go.sum

@@ -0,0 +1,9 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=