Fixed package version code extraction according to current API level

Lyor Goldstein · Lyor Goldstein · commit 5d9395545364 · 2023-09-21T08:10:27.000+03:00
diff --git a/logback-android/src/main/java/ch/qos/logback/core/android/AndroidContextUtil.java b/logback-android/src/main/java/ch/qos/logback/core/android/AndroidContextUtil.java
@@ -229,7 +229,10 @@ public String getVersionCode() {
       try {
         PackageManager pm = this.context.getPackageManager();
         PackageInfo pkgInfo = pm.getPackageInfo(getPackageName(), 0);
-        versionCode = "" + pkgInfo.versionCode;
+        versionCode = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
+                ? Long.toString(pkgInfo.getLongVersionCode())
+                : Integer.toString(pkgInfo.versionCode)
+                ;
       } catch (PackageManager.NameNotFoundException e) {
       }
     }
@@ -249,7 +252,7 @@ public String getVersionName() {
     return versionName != null ? versionName : "";
   }
 
-  private String absPath(File file) {
+  private static String absPath(File file) {
     return file != null ? file.getAbsolutePath() : "";
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,10 @@ public String getVersionCode() {`
`229`	`229`	`try {`
`230`	`230`	`PackageManager pm = this.context.getPackageManager();`
`231`	`231`	`PackageInfo pkgInfo = pm.getPackageInfo(getPackageName(), 0);`
`232`		`- versionCode = "" + pkgInfo.versionCode;`
	`232`	`+ versionCode = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)`
	`233`	`+ ? Long.toString(pkgInfo.getLongVersionCode())`
	`234`	`+ : Integer.toString(pkgInfo.versionCode)`
	`235`	`+ ;`
`233`	`236`	`} catch (PackageManager.NameNotFoundException e) {`
`234`	`237`	`}`
`235`	`238`	`}`
`@@ -249,7 +252,7 @@ public String getVersionName() {`
`249`	`252`	`return versionName != null ? versionName : "";`
`250`	`253`	`}`
`251`	`254`
`252`		`- private String absPath(File file) {`
	`255`	`+ private static String absPath(File file) {`
`253`	`256`	`return file != null ? file.getAbsolutePath() : "";`
`254`	`257`	`}`
`255`	`258`	`}`