Skip to content
This repository was archived by the owner on Jan 16, 2021. It is now read-only.

Commit 9c706cb

Browse files
albertolealPavan Kumar
authored andcommitted
Create an anonymous func to remove duplicate code.
In android_symbols uploader getBuildVersion, we can abstract out error handling into a separate anonymous function.
1 parent 104557b commit 9c706cb

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

android_symbol_uploader.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,7 @@ func parseVersionFromBytes(bytes []byte) (int, error) {
131131
}
132132

133133
func (a *androidSymbolUploader) getBuildVersion(e *env) (int, error) {
134-
if a.Manifest != "" {
135-
versionCode, err := a.getBuildVersionFromManifest()
134+
var handleError = func(versionCode int, err error) (int, error) {
136135
if err != nil {
137136
return 0, err
138137
}
@@ -142,14 +141,11 @@ func (a *androidSymbolUploader) getBuildVersion(e *env) (int, error) {
142141
return versionCode, nil
143142
}
144143

145-
versionCode, err := a.getBuildVersionFromAPK()
146-
if err != nil {
147-
return 0, err
148-
}
149-
if versionCode == 1 {
150-
fmt.Fprintln(e.Out, "Warning: build number is '1'.")
144+
if a.Manifest != "" {
145+
return handleError(a.getBuildVersionFromManifest())
151146
}
152-
return versionCode, nil
147+
148+
return handleError(a.getBuildVersionFromAPK())
153149
}
154150

155151
func (a *androidSymbolUploader) uploadSymbols(e *env) error {

0 commit comments

Comments
 (0)