Skip to content

Commit 3a9aae5

Browse files
committed
Removed packageinfo plugin
1 parent 36cf8a2 commit 3a9aae5

File tree

5 files changed

+30
-25
lines changed

5 files changed

+30
-25
lines changed

android/app/src/main/kotlin/com/invertedx/sentinelx/channel/SystemChannel.kt

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import android.content.Context
55
import android.content.Intent
66
import android.content.pm.PackageManager
77
import android.net.Uri
8+
import android.os.Build
89
import androidx.core.app.ActivityCompat
910
import androidx.core.content.ContextCompat
1011
import com.invertedx.sentinelx.MainActivity
@@ -14,14 +15,7 @@ import io.flutter.plugin.common.MethodCall
1415
import io.flutter.plugin.common.MethodChannel
1516
import org.bitcoinj.params.MainNetParams
1617
import org.bitcoinj.params.TestNet3Params
17-
import androidx.core.content.ContextCompat.startActivity
18-
import androidx.core.app.ActivityCompat.finishAffinity
19-
import androidx.core.content.ContextCompat.startActivity
20-
import android.app.AlarmManager
21-
import androidx.core.content.ContextCompat.getSystemService
22-
import android.app.PendingIntent
23-
import com.invertedx.sentinelx.i
24-
import io.flutter.embedding.android.SplashScreen
18+
import java.util.*
2519

2620

2721
class SystemChannel(private val applicationContext: Context, private val activity: MainActivity) : MethodChannel.MethodCallHandler {
@@ -107,6 +101,20 @@ class SystemChannel(private val applicationContext: Context, private val activit
107101
}
108102
}
109103

104+
"getPackageInfo" -> {
105+
val pm = applicationContext.packageManager
106+
val info = pm.getPackageInfo(applicationContext.packageName, 0)
107+
val map: MutableMap<String, String> = HashMap()
108+
map["appName"] = info.applicationInfo.loadLabel(pm).toString()
109+
map["packageName"] = applicationContext.packageName
110+
map["version"] = info.versionName
111+
map["buildNumber"] = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
112+
info.longVersionCode.toString()
113+
} else info.versionCode.toString()
114+
115+
result.success(map)
116+
}
117+
110118
}
111119
}
112120

lib/channels/system_channel.dart

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,13 @@ class SystemChannel {
7878
}
7979
}
8080

81-
81+
Future<Map<String,dynamic>> getPackageInfo() async {
82+
try {
83+
var run = await platform.invokeMapMethod<String, dynamic>("getPackageInfo");
84+
return run;
85+
} catch (exception) {
86+
print(exception);
87+
return null;
88+
}
89+
}
8290
}

lib/screens/settings.dart

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
import 'package:flutter/material.dart';
2-
import 'package:flutter/services.dart';
32
import 'package:flutter/widgets.dart';
4-
import 'package:package_info/package_info.dart';
5-
import 'package:sentinelx/channels/network_channel.dart';
3+
import 'package:sentinelx/channels/system_channel.dart';
64
import 'package:sentinelx/models/db/prefs_store.dart';
75
import 'package:sentinelx/models/db/sentinelx_db.dart';
86
import 'package:sentinelx/screens/Lock/lock_screen.dart';
97
import 'package:sentinelx/screens/dojo_configure.dart';
108
import 'package:sentinelx/shared_state/app_state.dart';
11-
import 'package:sentinelx/shared_state/sentinel_state.dart';
129
import 'package:sentinelx/widgets/confirm_modal.dart';
1310
import 'package:sentinelx/widgets/port_selector.dart';
1411
import 'package:sentinelx/widgets/qr_camera/push_up_camera_wrapper.dart';
@@ -205,10 +202,10 @@ class _SettingsState extends State<Settings> {
205202
this.setState(() {
206203
lockEnabled = lockState;
207204
});
208-
PackageInfo packageInfo = await PackageInfo.fromPlatform();
205+
Map<String, dynamic> packageInfo = await SystemChannel().getPackageInfo();
209206
setState(() {
210-
version = packageInfo.version;
211-
buildNumber = packageInfo.buildNumber;
207+
version = packageInfo['version'];
208+
buildNumber = packageInfo['buildNumber'];
212209
});
213210
}
214211

pubspec.lock

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,6 @@ packages:
137137
url: "https://pub.dartlang.org"
138138
source: hosted
139139
version: "1.1.8"
140-
package_info:
141-
dependency: "direct main"
142-
description:
143-
name: package_info
144-
url: "https://pub.dartlang.org"
145-
source: hosted
146-
version: "0.4.0+13"
147140
path:
148141
dependency: transitive
149142
description:
@@ -286,4 +279,4 @@ packages:
286279
version: "3.5.0"
287280
sdks:
288281
dart: ">=2.6.0 <3.0.0"
289-
flutter: ">=1.10.0 <2.0.0"
282+
flutter: ">=1.7.0"

pubspec.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ dependencies:
3232
# The following adds the Cupertino Icons font to your application.
3333
# Use with the CupertinoIcons class for iOS style icons.
3434
cupertino_icons: ^0.1.2
35-
package_info: ^0.4.0+13
3635

3736
dev_dependencies:
3837
flutter_test:

0 commit comments

Comments
 (0)