From be03611967afd7f6c6beeece8fe1c7843c20688c Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Thu, 2 Sep 2021 15:16:18 +0200 Subject: [PATCH 01/22] imp: updated dependencies & gradle --- .../package_info_plus/android/build.gradle | 4 ++-- .../package_info_plus/example/android/app/build.gradle | 10 +++++----- .../package_info_plus/example/android/build.gradle | 2 +- .../android/gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/build.gradle b/packages/package_info_plus/package_info_plus/android/build.gradle index 46e1ca5f4b..116ffa87ae 100644 --- a/packages/package_info_plus/package_info_plus/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.5.4' } } @@ -22,7 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 28 + compileSdkVersion 30 defaultConfig { minSdkVersion 16 diff --git a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle index c24eba0fe8..709b86cf7a 100644 --- a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 30 lintOptions { disable 'InvalidPackage' @@ -34,7 +34,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.packageinfoexample" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -53,7 +53,7 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/packages/package_info_plus/package_info_plus/example/android/build.gradle b/packages/package_info_plus/package_info_plus/example/android/build.gradle index 0f61fab3f7..580fda7ace 100644 --- a/packages/package_info_plus/package_info_plus/example/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:7.0.1' } } diff --git a/packages/package_info_plus/package_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties b/packages/package_info_plus/package_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties index 01a286e96a..297f2fec36 100644 --- a/packages/package_info_plus/package_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties +++ b/packages/package_info_plus/package_info_plus/example/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip From 81d3e3012cf3d2fb81e7cb221594969f6c15e202 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Thu, 2 Sep 2021 15:16:57 +0200 Subject: [PATCH 02/22] imp: fixed library importing not working correctly --- .../example/android/settings.gradle | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/example/android/settings.gradle b/packages/package_info_plus/package_info_plus/example/android/settings.gradle index 115da6cb4f..44e62bcf06 100644 --- a/packages/package_info_plus/package_info_plus/example/android/settings.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/settings.gradle @@ -1,15 +1,11 @@ include ':app' -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withInputStream { stream -> plugins.load(stream) } -} +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" From afa7e92f24d78053cd0a7a9167d253ca64ee2c9d Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Thu, 2 Sep 2021 15:17:40 +0200 Subject: [PATCH 03/22] imp: removed deprecated embedding v1 --- .../plus/packageinfo/PackageInfoPlugin.java | 6 ------ .../android/app/src/main/AndroidManifest.xml | 6 ------ .../packageinfoexample/EmbedderV1Activity.java | 18 ------------------ 3 files changed, 30 deletions(-) delete mode 100644 packages/package_info_plus/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 646193dee5..3938a35be4 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -14,7 +14,6 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -import io.flutter.plugin.common.PluginRegistry.Registrar; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.HashMap; @@ -26,11 +25,6 @@ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { private MethodChannel methodChannel; /** Plugin registration. */ - public static void registerWith(Registrar registrar) { - final PackageInfoPlugin instance = new PackageInfoPlugin(); - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); diff --git a/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml b/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml index e4d033e8d8..6e52c1b426 100644 --- a/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml @@ -14,12 +14,6 @@ - - diff --git a/packages/package_info_plus/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java b/packages/package_info_plus/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java deleted file mode 100644 index ccc1f20a71..0000000000 --- a/packages/package_info_plus/package_info_plus/example/android/app/src/main/java/io/flutter/plugins/packageinfoexample/EmbedderV1Activity.java +++ /dev/null @@ -1,18 +0,0 @@ -// Copyright 2017 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -package io.flutter.plugins.packageinfoexample; - -import android.os.Bundle; -import dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin; -import io.flutter.app.FlutterActivity; - -public class EmbedderV1Activity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - PackageInfoPlugin.registerWith( - registrarFor("dev.fluttercommunity.plus.packageinfo.PackageInfoPlugin")); - } -} From 1a2a88edfcd5c86cc6cdfdb47c4c43e4155d07bd Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Thu, 2 Sep 2021 15:20:37 +0200 Subject: [PATCH 04/22] imp: fixed packageManager deprecation & other minor improvements --- .../android/src/main/AndroidManifest.xml | 3 +- .../plus/packageinfo/PackageInfoPlugin.java | 36 +++++++++++++++---- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/AndroidManifest.xml b/packages/package_info_plus/package_info_plus/android/src/main/AndroidManifest.xml index 96f347ed64..8b327e5486 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/AndroidManifest.xml +++ b/packages/package_info_plus/package_info_plus/android/src/main/AndroidManifest.xml @@ -1,3 +1,2 @@ - + diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 3938a35be4..5422604bcf 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -4,10 +4,14 @@ package dev.fluttercommunity.plus.packageinfo; +import android.annotation.SuppressLint; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; + +import androidx.annotation.NonNull; + import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodCall; @@ -37,25 +41,27 @@ private void onAttachedToEngine(Context applicationContext, BinaryMessenger mess } @Override - public void onDetachedFromEngine(FlutterPluginBinding binding) { + public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) { applicationContext = null; methodChannel.setMethodCallHandler(null); methodChannel = null; } @Override - public void onMethodCall(MethodCall call, Result result) { + public void onMethodCall(MethodCall call, @NonNull Result result) { try { if (call.method.equals("getAll")) { PackageManager pm = applicationContext.getPackageManager(); PackageInfo info = pm.getPackageInfo(applicationContext.getPackageName(), 0); + String buildSignature = getBuildSignature(pm); + Map map = new HashMap<>(); map.put("appName", info.applicationInfo.loadLabel(pm).toString()); map.put("packageName", applicationContext.getPackageName()); map.put("version", info.versionName); map.put("buildNumber", String.valueOf(getLongVersionCode(info))); - map.put("buildSignature", getBuildSignature(pm)); + if (buildSignature != null) map.put("buildSignature", buildSignature); result.success(map); } else { @@ -74,17 +80,33 @@ private static long getLongVersionCode(PackageInfo info) { return info.versionCode; } + @SuppressWarnings("deprecation") private String getBuildSignature(PackageManager pm) { try { - PackageInfo packageInfo = + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + PackageInfo packageInfo = pm.getPackageInfo(applicationContext.getPackageName(), PackageManager.GET_SIGNING_CERTIFICATES); + if (packageInfo == null + || packageInfo.signingInfo == null) { + return null; + } + if(packageInfo.signingInfo.hasMultipleSigners()){ + return signatureToSha1(packageInfo.signingInfo.getApkContentsSigners()[0].toByteArray()); + } + else{ + return signatureToSha1(packageInfo.signingInfo.getSigningCertificateHistory()[0].toByteArray()); + } + } + else { + @SuppressLint("PackageManagerGetSignatures") PackageInfo packageInfo = pm.getPackageInfo(applicationContext.getPackageName(), PackageManager.GET_SIGNATURES); - if (packageInfo == null + if (packageInfo == null || packageInfo.signatures == null || packageInfo.signatures.length == 0 || packageInfo.signatures[0] == null) { - return null; + return null; + } + return signatureToSha1(packageInfo.signatures[0].toByteArray()); } - return signatureToSha1(packageInfo.signatures[0].toByteArray()); } catch (PackageManager.NameNotFoundException | NoSuchAlgorithmException e) { return null; } From 8b769980014f49586b33223cc126c2113695fb6f Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Thu, 2 Sep 2021 15:39:48 +0200 Subject: [PATCH 05/22] test: fix integration test --- .../example/test_driver/package_info_plus_e2e.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart b/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart index cb47c491c4..59ebf3abe5 100644 --- a/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart +++ b/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart @@ -19,9 +19,9 @@ void main() { // These tests are based on the example app. The tests should be updated if any related info changes. if (Platform.isAndroid) { expect(info.appName, 'package_info_example'); - expect(info.buildNumber, '1'); + expect(info.buildNumber, '4'); expect(info.packageName, 'io.flutter.plugins.packageinfoexample'); - expect(info.version, '1.0'); + expect(info.version, '1.2.3'); } else if (Platform.isIOS) { expect(info.appName, 'Package Info Example'); expect(info.buildNumber, '1'); @@ -52,10 +52,10 @@ void main() { await tester.pumpAndSettle(); if (Platform.isAndroid) { expect(find.text('package_info_example'), findsOneWidget); - expect(find.text('1'), findsOneWidget); + expect(find.text('4'), findsOneWidget); expect( find.text('io.flutter.plugins.packageinfoexample'), findsOneWidget); - expect(find.text('1.0'), findsOneWidget); + expect(find.text('1.2.3'), findsOneWidget); } else if (Platform.isIOS) { expect(find.text('Package Info Example'), findsOneWidget); expect(find.text('1'), findsOneWidget); From c8bdda8047a0827664a0161d1bbe6fe8472f47e4 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Fri, 10 Sep 2021 09:24:46 +0200 Subject: [PATCH 06/22] imp: update gradle --- .../package_info_plus/example/android/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/package_info_plus/package_info_plus/example/android/build.gradle b/packages/package_info_plus/package_info_plus/example/android/build.gradle index 580fda7ace..22c7563f02 100644 --- a/packages/package_info_plus/package_info_plus/example/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/build.gradle @@ -5,7 +5,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.1' + classpath 'com.android.tools.build:gradle:7.0.2' } } @@ -14,6 +14,9 @@ allprojects { google() mavenCentral() } + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" + } } rootProject.buildDir = '../build' From 343e5e426032a001ea4990f7ea370b33e10cf441 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Fri, 10 Sep 2021 09:26:07 +0200 Subject: [PATCH 07/22] style: format --- .../plus/packageinfo/PackageInfoPlugin.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 5422604bcf..4ba979b804 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -18,17 +18,22 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; + import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.Map; -/** PackageInfoPlugin */ +/** + * PackageInfoPlugin + */ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { private Context applicationContext; private MethodChannel methodChannel; - /** Plugin registration. */ + /** + * Plugin registration. + */ @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); @@ -89,15 +94,13 @@ private String getBuildSignature(PackageManager pm) { || packageInfo.signingInfo == null) { return null; } - if(packageInfo.signingInfo.hasMultipleSigners()){ + if (packageInfo.signingInfo.hasMultipleSigners()) { return signatureToSha1(packageInfo.signingInfo.getApkContentsSigners()[0].toByteArray()); - } - else{ + } else { return signatureToSha1(packageInfo.signingInfo.getSigningCertificateHistory()[0].toByteArray()); } - } - else { - @SuppressLint("PackageManagerGetSignatures") PackageInfo packageInfo = + } else { + @SuppressLint("PackageManagerGetSignatures") PackageInfo packageInfo = pm.getPackageInfo(applicationContext.getPackageName(), PackageManager.GET_SIGNATURES); if (packageInfo == null || packageInfo.signatures == null From 31918a701b15c35605fb8425cb96b5ef2e23889a Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 28 Sep 2021 09:05:08 +0200 Subject: [PATCH 08/22] imp: upgrade test and dependencies --- .../package_info_plus/package_info_plus/example/pubspec.yaml | 5 +++-- .../example/test_driver/package_info_plus_e2e.dart | 2 -- .../example/test_driver/package_info_plus_e2e_test.dart | 2 -- packages/package_info_plus/package_info_plus/pubspec.yaml | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/package_info_plus/example/pubspec.yaml index cb30d226fd..6128703b2b 100644 --- a/packages/package_info_plus/package_info_plus/example/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/example/pubspec.yaml @@ -7,14 +7,15 @@ environment: sdk: '>=2.12.0 <3.0.0' dependencies: + universal_io: ^2.0.4 flutter: sdk: flutter package_info_plus: path: ../ - integration_test: ^1.0.2 - universal_io: ^1.0.1 dev_dependencies: + integration_test: + sdk: flutter flutter_driver: sdk: flutter test: any diff --git a/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart b/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart index 59ebf3abe5..c7f83b646d 100644 --- a/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart +++ b/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart=2.9 - import 'package:flutter/foundation.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:integration_test/integration_test.dart'; diff --git a/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e_test.dart b/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e_test.dart index d9142936ef..c66f62f15c 100644 --- a/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e_test.dart +++ b/packages/package_info_plus/package_info_plus/example/test_driver/package_info_plus_e2e_test.dart @@ -2,8 +2,6 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. -// @dart=2.9 - import 'dart:convert'; import 'dart:io'; diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index 25087e65a4..f729209c2e 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -33,7 +33,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - test: ^1.16.4 + test: ^1.17.10 pedantic: ^1.10.0 environment: From 90454f97ee0410d0d0d8728538c55def1160dffd Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 28 Sep 2021 09:21:46 +0200 Subject: [PATCH 09/22] imp: upgrade gradle and android compile version --- .../package_info_plus/package_info_plus/android/build.gradle | 4 ++-- .../package_info_plus/example/android/app/build.gradle | 4 ++-- .../example/android/app/src/main/AndroidManifest.xml | 3 ++- .../package_info_plus/example/android/gradle.properties | 1 - 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/build.gradle b/packages/package_info_plus/package_info_plus/android/build.gradle index 116ffa87ae..632f51b5c0 100644 --- a/packages/package_info_plus/package_info_plus/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/android/build.gradle @@ -8,7 +8,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.4' + classpath 'com.android.tools.build:gradle:7.0.2' } } @@ -22,7 +22,7 @@ rootProject.allprojects { apply plugin: 'com.android.library' android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { minSdkVersion 16 diff --git a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle index 709b86cf7a..5e2b673e3a 100644 --- a/packages/package_info_plus/package_info_plus/example/android/app/build.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/app/build.gradle @@ -25,7 +25,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 lintOptions { disable 'InvalidPackage' @@ -34,7 +34,7 @@ android { defaultConfig { applicationId "io.flutter.plugins.packageinfoexample" minSdkVersion 16 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml b/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml index 6e52c1b426..091c179ba7 100644 --- a/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml +++ b/packages/package_info_plus/package_info_plus/example/android/app/src/main/AndroidManifest.xml @@ -8,7 +8,8 @@ android:theme="@android:style/Theme.Black.NoTitleBar" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection" android:hardwareAccelerated="true" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="adjustResize" + android:exported="true"> diff --git a/packages/package_info_plus/package_info_plus/example/android/gradle.properties b/packages/package_info_plus/package_info_plus/example/android/gradle.properties index 05413bc45d..08f2b5f91b 100644 --- a/packages/package_info_plus/package_info_plus/example/android/gradle.properties +++ b/packages/package_info_plus/package_info_plus/example/android/gradle.properties @@ -1,4 +1,3 @@ org.gradle.jvmargs=-Xmx1536M android.enableJetifier=true -android.enableR8=true android.useAndroidX=true From a738e1a755eb8dc43243b900407658231ac59514 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Fri, 1 Oct 2021 22:57:00 +0200 Subject: [PATCH 10/22] refactor: reverted embedding v1 function + annotation, bumped version and added changelog entry --- packages/package_info_plus/package_info_plus/CHANGELOG.md | 5 +++++ .../plus/packageinfo/PackageInfoPlugin.java | 6 ++++++ .../package_info_plus/example/android/build.gradle | 3 --- packages/package_info_plus/package_info_plus/pubspec.yaml | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/CHANGELOG.md b/packages/package_info_plus/package_info_plus/CHANGELOG.md index 49c1b428d1..c417ee7988 100644 --- a/packages/package_info_plus/package_info_plus/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.0.7 + +- Annotated deprecated embeddingV1 function +- Upgraded gradle and Android API version + ## 1.0.6 - Web: Fixed url resolving for the version.json diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 4ba979b804..66dd03b600 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -34,6 +34,12 @@ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { /** * Plugin registration. */ + @SuppressWarnings("deprecation") + public static void registerWith(Registrar registrar) { + final PackageInfoPlugin instance = new PackageInfoPlugin(); + instance.onAttachedToEngine(registrar.context(), registrar.messenger()); + } + @Override public void onAttachedToEngine(FlutterPluginBinding binding) { onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); diff --git a/packages/package_info_plus/package_info_plus/example/android/build.gradle b/packages/package_info_plus/package_info_plus/example/android/build.gradle index 22c7563f02..b72cb3c88f 100644 --- a/packages/package_info_plus/package_info_plus/example/android/build.gradle +++ b/packages/package_info_plus/package_info_plus/example/android/build.gradle @@ -14,9 +14,6 @@ allprojects { google() mavenCentral() } - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" - } } rootProject.buildDir = '../build' diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index f729209c2e..07814c1f88 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. -version: 1.0.6 +version: 1.0.7 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From c371e9aa2efa9f3e3e1a86951156559cc59b357e Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Fri, 1 Oct 2021 22:59:09 +0200 Subject: [PATCH 11/22] bug: added registry import --- .../dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 66dd03b600..533312c185 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -18,6 +18,7 @@ import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; +import io.flutter.plugin.common.PluginRegistry.Registrar; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; From eefc14cf67057f146b7029cf642ab4d4f8a09327 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Sun, 3 Oct 2021 20:34:45 +0200 Subject: [PATCH 12/22] imp: bump version --- packages/package_info_plus/package_info_plus/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index 8c82c51151..e20c65ed11 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. -version: 1.2.1 +version: 1.2.2 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From d4cc7d7008f8edcd2395bce5f7e8a9fb5fe15bc1 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Sun, 3 Oct 2021 20:44:10 +0200 Subject: [PATCH 13/22] bug: removed double integration test declaration --- .../package_info_plus/package_info_plus/example/pubspec.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/package_info_plus/example/pubspec.yaml index fa0f278b32..6128703b2b 100644 --- a/packages/package_info_plus/package_info_plus/example/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/example/pubspec.yaml @@ -18,8 +18,6 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - integration_test: - sdk: flutter test: any pedantic: ^1.10.0 From a9c26699040b7d87e896758348ae7d24f9a89488 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Sun, 3 Oct 2021 20:51:53 +0200 Subject: [PATCH 14/22] imp: fix test --- packages/sensors_plus/sensors_plus/test/sensors_test.dart | 1 + .../test/sensors_plus_platform_interface_test.dart | 1 + .../test/share_plus_platform_interface_test.dart | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/sensors_plus/sensors_plus/test/sensors_test.dart b/packages/sensors_plus/sensors_plus/test/sensors_test.dart index 2a98c1d9fc..3817f5ee2f 100644 --- a/packages/sensors_plus/sensors_plus/test/sensors_test.dart +++ b/packages/sensors_plus/sensors_plus/test/sensors_test.dart @@ -6,6 +6,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding; +import 'package:flutter_test/src/deprecated.dart'; import 'package:sensors_plus/sensors_plus.dart'; import 'package:test/test.dart'; diff --git a/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart b/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart index b7bff2dbf4..d2aac35906 100644 --- a/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart +++ b/packages/sensors_plus/sensors_plus_platform_interface/test/sensors_plus_platform_interface_test.dart @@ -6,6 +6,7 @@ import 'dart:typed_data'; import 'package:flutter/services.dart'; import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding; +import 'package:flutter_test/src/deprecated.dart'; import 'package:sensors_plus_platform_interface/sensors_plus_platform_interface.dart'; import 'package:sensors_plus_platform_interface/src/method_channel_sensors.dart'; import 'package:test/test.dart'; diff --git a/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart b/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart index 68de78e751..26cd5dc79c 100644 --- a/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart +++ b/packages/share_plus/share_plus_platform_interface/test/share_plus_platform_interface_test.dart @@ -6,6 +6,7 @@ import 'dart:io'; import 'dart:ui'; import 'package:flutter_test/flutter_test.dart' show TestWidgetsFlutterBinding; +import 'package:flutter_test/src/deprecated.dart'; import 'package:mockito/mockito.dart'; import 'package:share_plus_platform_interface/share_plus_platform_interface.dart'; import 'package:share_plus_platform_interface/method_channel/method_channel_share.dart'; From 98b2705136cd913635b5ad7e1104f34a649d63c5 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Sun, 3 Oct 2021 21:01:58 +0200 Subject: [PATCH 15/22] test: removed unused test import --- .../package_info_plus/package_info_plus/example/pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/package_info_plus/package_info_plus/example/pubspec.yaml b/packages/package_info_plus/package_info_plus/example/pubspec.yaml index 6128703b2b..f6cb9f0100 100644 --- a/packages/package_info_plus/package_info_plus/example/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/example/pubspec.yaml @@ -18,7 +18,6 @@ dev_dependencies: sdk: flutter flutter_driver: sdk: flutter - test: any pedantic: ^1.10.0 flutter: From ca3d1bf9cb5d983e3d0ff9473a4f7583e261e95d Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Sun, 3 Oct 2021 21:07:57 +0200 Subject: [PATCH 16/22] test: downgrade because of version mismatch --- packages/package_info_plus/package_info_plus/pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index e20c65ed11..8e57edcbfd 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -33,7 +33,7 @@ dependencies: dev_dependencies: flutter_test: sdk: flutter - test: ^1.17.10 + test: ^1.16.4 pedantic: ^1.10.0 environment: From 7c1db2490313fd8e401a2cee850451ddc43b465e Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Mon, 4 Oct 2021 08:43:56 +0200 Subject: [PATCH 17/22] imp: removed v1 embedding as discussed in #461 --- .../plus/packageinfo/PackageInfoPlugin.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 533312c185..b5b9a444f2 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -35,20 +35,10 @@ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { /** * Plugin registration. */ - @SuppressWarnings("deprecation") - public static void registerWith(Registrar registrar) { - final PackageInfoPlugin instance = new PackageInfoPlugin(); - instance.onAttachedToEngine(registrar.context(), registrar.messenger()); - } - @Override public void onAttachedToEngine(FlutterPluginBinding binding) { - onAttachedToEngine(binding.getApplicationContext(), binding.getBinaryMessenger()); - } - - private void onAttachedToEngine(Context applicationContext, BinaryMessenger messenger) { - this.applicationContext = applicationContext; - methodChannel = new MethodChannel(messenger, "dev.fluttercommunity.plus/package_info"); + this.applicationContext = binding.getApplicationContext(); + methodChannel = new MethodChannel(binding.getBinaryMessenger(), "dev.fluttercommunity.plus/package_info"); methodChannel.setMethodCallHandler(this); } From 48683c41c2fa9d8b881e3fb419eb53b023a83150 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Mon, 4 Oct 2021 08:44:24 +0200 Subject: [PATCH 18/22] bump version to 1.3.0 and updated changelog --- packages/package_info_plus/package_info_plus/CHANGELOG.md | 4 ++-- packages/package_info_plus/package_info_plus/pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/CHANGELOG.md b/packages/package_info_plus/package_info_plus/CHANGELOG.md index e65b1ce300..ed394f384c 100644 --- a/packages/package_info_plus/package_info_plus/CHANGELOG.md +++ b/packages/package_info_plus/package_info_plus/CHANGELOG.md @@ -1,6 +1,6 @@ -## 1.2.2 +## 1.3.0 -- Annotated deprecated embeddingV1 function +- Removed deprecated embeddingV1 function - Upgraded gradle and Android API version ## 1.2.1 diff --git a/packages/package_info_plus/package_info_plus/pubspec.yaml b/packages/package_info_plus/package_info_plus/pubspec.yaml index 8e57edcbfd..cf723ac755 100644 --- a/packages/package_info_plus/package_info_plus/pubspec.yaml +++ b/packages/package_info_plus/package_info_plus/pubspec.yaml @@ -1,6 +1,6 @@ name: package_info_plus description: Flutter plugin for querying information about the application package, such as CFBundleVersion on iOS or versionCode on Android. -version: 1.2.2 +version: 1.3.0 homepage: https://plus.fluttercommunity.dev/ repository: https://github.com/fluttercommunity/plus_plugins/tree/main/packages/ From f1ea833c04b00f5bda384186b7fea08e0c09b1c2 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Mon, 4 Oct 2021 11:52:23 +0200 Subject: [PATCH 19/22] imp: removed unused import --- .../fluttercommunity/plus/packageinfo/PackageInfoPlugin.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index b5b9a444f2..c6264dbe55 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -13,12 +13,10 @@ import androidx.annotation.NonNull; import io.flutter.embedding.engine.plugins.FlutterPlugin; -import io.flutter.plugin.common.BinaryMessenger; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -import io.flutter.plugin.common.PluginRegistry.Registrar; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; From d82c81b37544e59cdb637226d7f9dd4d219a4851 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 08:44:57 +0200 Subject: [PATCH 20/22] style: reformat file --- .../plus/packageinfo/PackageInfoPlugin.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index c6264dbe55..a34dd8825b 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -12,17 +12,17 @@ import androidx.annotation.NonNull; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.Map; + import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.Map; - /** * PackageInfoPlugin */ @@ -30,6 +30,14 @@ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { private Context applicationContext; private MethodChannel methodChannel; + @SuppressWarnings("deprecation") + private static long getLongVersionCode(PackageInfo info) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + return info.getLongVersionCode(); + } + return info.versionCode; + } + /** * Plugin registration. */ @@ -72,14 +80,6 @@ public void onMethodCall(MethodCall call, @NonNull Result result) { } } - @SuppressWarnings("deprecation") - private static long getLongVersionCode(PackageInfo info) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - return info.getLongVersionCode(); - } - return info.versionCode; - } - @SuppressWarnings("deprecation") private String getBuildSignature(PackageManager pm) { try { From 3e8465ca62f7196af7ee0df61c1fa88241e288a4 Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 09:06:39 +0200 Subject: [PATCH 21/22] style: reformat file --- .../plus/packageinfo/PackageInfoPlugin.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index a34dd8825b..7be92c961d 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -23,9 +23,7 @@ import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; -/** - * PackageInfoPlugin - */ +/** PackageInfoPlugin */ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin { private Context applicationContext; private MethodChannel methodChannel; @@ -38,13 +36,12 @@ private static long getLongVersionCode(PackageInfo info) { return info.versionCode; } - /** - * Plugin registration. - */ + /** Plugin registration. */ @Override public void onAttachedToEngine(FlutterPluginBinding binding) { this.applicationContext = binding.getApplicationContext(); - methodChannel = new MethodChannel(binding.getBinaryMessenger(), "dev.fluttercommunity.plus/package_info"); + methodChannel = + new MethodChannel(binding.getBinaryMessenger(), "dev.fluttercommunity.plus/package_info"); methodChannel.setMethodCallHandler(this); } @@ -84,23 +81,26 @@ public void onMethodCall(MethodCall call, @NonNull Result result) { private String getBuildSignature(PackageManager pm) { try { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { - PackageInfo packageInfo = pm.getPackageInfo(applicationContext.getPackageName(), PackageManager.GET_SIGNING_CERTIFICATES); - if (packageInfo == null - || packageInfo.signingInfo == null) { + PackageInfo packageInfo = + pm.getPackageInfo( + applicationContext.getPackageName(), PackageManager.GET_SIGNING_CERTIFICATES); + if (packageInfo == null || packageInfo.signingInfo == null) { return null; } if (packageInfo.signingInfo.hasMultipleSigners()) { return signatureToSha1(packageInfo.signingInfo.getApkContentsSigners()[0].toByteArray()); } else { - return signatureToSha1(packageInfo.signingInfo.getSigningCertificateHistory()[0].toByteArray()); + return signatureToSha1( + packageInfo.signingInfo.getSigningCertificateHistory()[0].toByteArray()); } } else { - @SuppressLint("PackageManagerGetSignatures") PackageInfo packageInfo = - pm.getPackageInfo(applicationContext.getPackageName(), PackageManager.GET_SIGNATURES); + @SuppressLint("PackageManagerGetSignatures") + PackageInfo packageInfo = + pm.getPackageInfo(applicationContext.getPackageName(), PackageManager.GET_SIGNATURES); if (packageInfo == null - || packageInfo.signatures == null - || packageInfo.signatures.length == 0 - || packageInfo.signatures[0] == null) { + || packageInfo.signatures == null + || packageInfo.signatures.length == 0 + || packageInfo.signatures[0] == null) { return null; } return signatureToSha1(packageInfo.signatures[0].toByteArray()); From 61879c6ed94fbad539c33432c93ebdb74eb573fc Mon Sep 17 00:00:00 2001 From: Julian Steenbakker Date: Tue, 5 Oct 2021 09:22:05 +0200 Subject: [PATCH 22/22] style: reformat file --- .../plus/packageinfo/PackageInfoPlugin.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java index 7be92c961d..317f363340 100644 --- a/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java +++ b/packages/package_info_plus/package_info_plus/android/src/main/java/dev/fluttercommunity/plus/packageinfo/PackageInfoPlugin.java @@ -9,19 +9,16 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.os.Build; - import androidx.annotation.NonNull; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; -import java.util.Map; - import io.flutter.embedding.engine.plugins.FlutterPlugin; import io.flutter.plugin.common.MethodCall; import io.flutter.plugin.common.MethodChannel; import io.flutter.plugin.common.MethodChannel.MethodCallHandler; import io.flutter.plugin.common.MethodChannel.Result; +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; +import java.util.HashMap; +import java.util.Map; /** PackageInfoPlugin */ public class PackageInfoPlugin implements MethodCallHandler, FlutterPlugin {