Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit a65913b

Browse files
GaryQianGaryQian
committed
Use string.format
Const-ness, nits, codestyle Typo
1 parent bc6f047 commit a65913b

File tree

14 files changed

+90
-98
lines changed

14 files changed

+90
-98
lines changed

‎shell/common/engine.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ const std::string& Engine::GetLastEntrypointLibrary() const {
517517

518518
void Engine::CompleteDartLoadLibrary(intptr_t loading_unit_id,
519519
std::string lib_name,
520-
std::vector<std::string>& apkPaths,
520+
const std::vector<std::string>& apkPaths,
521521
std::string abi) {
522522
if (runtime_controller_->IsRootIsolateRunning()) {
523523
// runtime_controller_->CompleteDartLoadLibrary(loading_unit_id, lib_name,

‎shell/common/engine.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ class Engine final : public RuntimeDelegate,
800800
///
801801
void CompleteDartLoadLibrary(intptr_t loading_unit_id,
802802
std::string lib_name,
803-
std::vector<std::string>& apkPaths,
803+
const std::vector<std::string>& apkPaths,
804804
std::string abi);
805805

806806
private:

‎shell/common/platform_view.cc‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,11 @@ Dart_Handle PlatformView::OnDartLoadLibrary(intptr_t loading_unit_id) {
156156
return Dart_Null();
157157
}
158158

159-
void PlatformView::CompleteDartLoadLibrary(intptr_t loading_unit_id,
160-
std::string lib_name,
161-
std::vector<std::string>& apkPaths,
162-
std::string abi) {}
159+
void PlatformView::CompleteDartLoadLibrary(
160+
intptr_t loading_unit_id,
161+
std::string lib_name,
162+
const std::vector<std::string>& apkPaths,
163+
std::string abi) {}
163164

164165
void PlatformView::UpdateAssetManager(
165166
std::shared_ptr<AssetManager> asset_manager) {}

‎shell/common/platform_view.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -260,10 +260,11 @@ class PlatformView {
260260
///
261261
/// @param[in] abi The abi of the library, eg, arm64-v8a
262262
///
263-
virtual void CompleteDartLoadLibrary(intptr_t loading_unit_id,
264-
std::string lib_name,
265-
std::vector<std::string>& apkPaths,
266-
std::string abi) = 0;
263+
virtual void CompleteDartLoadLibrary(
264+
intptr_t loading_unit_id,
265+
std::string lib_name,
266+
const std::vector<std::string>& apkPaths,
267+
std::string abi) = 0;
267268

268269
//--------------------------------------------------------------------------
269270
/// @brief Sets the asset manager of the engine to asset_manager
@@ -657,7 +658,7 @@ class PlatformView {
657658
///
658659
virtual void CompleteDartLoadLibrary(intptr_t loading_unit_id,
659660
std::string lib_name,
660-
std::vector<std::string>& apkPaths,
661+
const std::vector<std::string>& apkPaths,
661662
std::string abi);
662663

663664
//--------------------------------------------------------------------------

‎shell/common/shell.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1190,7 +1190,7 @@ Shell::ComputePlatformViewResolvedLocale(
11901190

11911191
void Shell::CompleteDartLoadLibrary(intptr_t loading_unit_id,
11921192
std::string lib_name,
1193-
std::vector<std::string>& apkPaths,
1193+
const std::vector<std::string>& apkPaths,
11941194
std::string abi) {
11951195
engine_->CompleteDartLoadLibrary(loading_unit_id, lib_name, apkPaths, abi);
11961196
}

‎shell/common/shell.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ class Shell final : public PlatformView::Delegate,
518518
// |PlatformView::Delegate|
519519
void CompleteDartLoadLibrary(intptr_t loading_unit_id,
520520
std::string lib_name,
521-
std::vector<std::string>& apkPaths,
521+
const std::vector<std::string>& apkPaths,
522522
std::string abi) override;
523523

524524
// |PlatformView::Delegate|

‎shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -962,17 +962,18 @@ public void setDynamicFeatureContext(@NonNull Context context) {
962962
@SuppressWarnings("unused")
963963
@UiThread
964964
public void downloadDynamicFeature(int loadingUnitId) {
965-
String loadingUnitIdResName =
965+
int moduleNameIdentifier =
966966
dynamicFeatureContext
967967
.getResources()
968-
.getString(
969-
dynamicFeatureContext
970-
.getResources()
971-
.getIdentifier(
972-
"loadingUnit" + loadingUnitId,
973-
"string",
974-
dynamicFeatureContext.getPackageName()));
975-
downloadDynamicFeature(loadingUnitIdResName, loadingUnitId);
968+
.getIdentifier(
969+
"loadingUnit" + loadingUnitId,
970+
"string",
971+
dynamicFeatureContext.getPackageName());
972+
String moduleName =
973+
dynamicFeatureContext
974+
.getResources()
975+
.getString(moduleNameIdentifier);
976+
downloadDynamicFeature(moduleName, loadingUnitId);
976977
}
977978

978979
// Called by the engine upon invocation of dart loadLibrary() request

‎shell/platform/android/io/flutter/embedding/engine/dynamicfeatures/PlayStoreDynamicFeatureManager.java‎

Lines changed: 59 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,11 @@ public void onStateUpdate(SplitInstallSessionState state) {
5151
{
5252
Log.e(
5353
TAG,
54-
"Module \""
55-
+ sessionIdToName.get(state.sessionId())
56-
+ "\" (sessionId "
57-
+ state.sessionId()
58-
+ ") install failed with "
59-
+ state.errorCode());
54+
String.format(
55+
"Module \"%s\" (sessionId %d) install failed with: %s",
56+
sessionIdToName.get(state.sessionId()),
57+
state.sessionId(),
58+
state.errorCode()));
6059
flutterJNI.dynamicFeatureInstallFailure(
6160
sessionIdToName.get(state.sessionId()),
6261
sessionIdToLoadingUnitId.get(state.sessionId()),
@@ -68,13 +67,12 @@ public void onStateUpdate(SplitInstallSessionState state) {
6867
}
6968
case SplitInstallSessionStatus.INSTALLED:
7069
{
71-
Log.d(
70+
Log.e(
7271
TAG,
73-
"Module \""
74-
+ sessionIdToName.get(state.sessionId())
75-
+ "\" (sessionId "
76-
+ state.sessionId()
77-
+ ") installed successfully.");
72+
String.format(
73+
"Module \"%s\" (sessionId %d) install successfully.",
74+
sessionIdToName.get(state.sessionId()),
75+
state.sessionId()));
7876
loadAssets(
7977
sessionIdToName.get(state.sessionId()),
8078
sessionIdToLoadingUnitId.get(state.sessionId()));
@@ -90,81 +88,73 @@ public void onStateUpdate(SplitInstallSessionState state) {
9088
}
9189
case SplitInstallSessionStatus.CANCELED:
9290
{
93-
Log.d(
91+
Log.e(
9492
TAG,
95-
"Module \""
96-
+ sessionIdToName.get(state.sessionId())
97-
+ "\" (sessionId "
98-
+ state.sessionId()
99-
+ ") cancelled");
93+
String.format(
94+
"Module \"%s\" (sessionId %d) install canceled.",
95+
sessionIdToName.get(state.sessionId()),
96+
state.sessionId()));
10097
sessionIdToName.remove(state.sessionId());
10198
break;
10299
}
103100
case SplitInstallSessionStatus.CANCELING:
104101
{
105-
Log.d(
102+
Log.e(
106103
TAG,
107-
"Module \""
108-
+ sessionIdToName.get(state.sessionId())
109-
+ "\" (sessionId "
110-
+ state.sessionId()
111-
+ ") canceling");
112-
sessionIdToName.remove(state.sessionId());
104+
String.format(
105+
"Module \"%s\" (sessionId %d) install canceling.",
106+
sessionIdToName.get(state.sessionId()),
107+
state.sessionId()));
113108
break;
114109
}
115110
case SplitInstallSessionStatus.PENDING:
116111
{
117-
Log.d(
112+
Log.e(
118113
TAG,
119-
"Module \""
120-
+ sessionIdToName.get(state.sessionId())
121-
+ "\" (sessionId "
122-
+ state.sessionId()
123-
+ ") pending.");
114+
String.format(
115+
"Module \"%s\" (sessionId %d) install pending.",
116+
sessionIdToName.get(state.sessionId()),
117+
state.sessionId()));
124118
break;
125119
}
126120
case SplitInstallSessionStatus.REQUIRES_USER_CONFIRMATION:
127121
{
128-
Log.d(
122+
Log.e(
129123
TAG,
130-
"Module \""
131-
+ sessionIdToName.get(state.sessionId())
132-
+ "\" (sessionId "
133-
+ state.sessionId()
134-
+ ") requires user confirmation.");
124+
String.format(
125+
"Module \"%s\" (sessionId %d) install requires user confirmation.",
126+
sessionIdToName.get(state.sessionId()),
127+
state.sessionId()));
135128
break;
136129
}
137130
case SplitInstallSessionStatus.DOWNLOADING:
138131
{
139-
Log.d(
132+
Log.e(
140133
TAG,
141-
"Module \""
142-
+ sessionIdToName.get(state.sessionId())
143-
+ "\" (sessionId "
144-
+ state.sessionId()
145-
+ ") downloading.");
134+
String.format(
135+
"Module \"%s\" (sessionId %d) downloading.",
136+
sessionIdToName.get(state.sessionId()),
137+
state.sessionId()));
146138
break;
147139
}
148140
case SplitInstallSessionStatus.DOWNLOADED:
149141
{
150-
Log.d(
142+
Log.e(
151143
TAG,
152-
"Module \""
153-
+ sessionIdToName.get(state.sessionId())
154-
+ "\" (sessionId "
155-
+ state.sessionId()
156-
+ ") downloaded.");
144+
String.format(
145+
"Module \"%s\" (sessionId %d) downloaded.",
146+
sessionIdToName.get(state.sessionId()),
147+
state.sessionId()));
157148
break;
158149
}
159150
case SplitInstallSessionStatus.INSTALLING:
160151
{
161-
Log.d(
152+
Log.e(
162153
TAG,
163-
"Module \""
164-
+ sessionIdToName.get(state.sessionId())
165-
+ "\" (sessionId "
166-
+ state.sessionId()
167-
+ ") installing.");
154+
String.format(
155+
"Module \"%s\" (sessionId %d) installing.",
156+
sessionIdToName.get(state.sessionId()),
157+
state.sessionId()));
168158
break;
169159
}
170160
default:
@@ -211,30 +201,29 @@ public void downloadFeature(String moduleName, int loadingUnitId) {
211201
flutterJNI.dynamicFeatureInstallFailure(
212202
moduleName,
213203
loadingUnitId,
214-
"Install of dynamic feature module \""
215-
+ moduleName
216-
+ "\" failed with a network error",
204+
String.format(
205+
"Install of dynamic feature module \"%s\" failed with a network error",
206+
moduleName),
217207
true);
218208
break;
219209
case SplitInstallErrorCode.MODULE_UNAVAILABLE:
220210
flutterJNI.dynamicFeatureInstallFailure(
221211
moduleName,
222212
loadingUnitId,
223-
"Install of dynamic feature module \""
224-
+ moduleName
225-
+ "\" failed as is unavailable.",
213+
String.format(
214+
"Install of dynamic feature module \"%s\" failed as it is unavailable",
215+
moduleName),
226216
false);
227217
break;
228218
default:
229219
flutterJNI.dynamicFeatureInstallFailure(
230220
moduleName,
231221
loadingUnitId,
232-
"Install of dynamic feature module \""
233-
+ moduleName
234-
+ "\" failed with error: \""
235-
+ ((SplitInstallException) exception).getErrorCode()
236-
+ "\": "
237-
+ ((SplitInstallException) exception).getMessage(),
222+
String.format(
223+
"Install of dynamic feature module \"%s\" failed with error %d: %s",
224+
moduleName,
225+
((SplitInstallException) exception).getErrorCode(),
226+
((SplitInstallException) exception).getMessage()),
238227
false);
239228
break;
240229
}
@@ -270,7 +259,7 @@ public void loadDartLibrary(String moduleName, int loadingUnitId) {
270259
String pathAbi = abi.replace("-", "_"); // abis are represented with underscores in paths.
271260

272261
// TODO(garyq): Optimize this apk/file discovery process to use less i/o and be more
273-
// performant.
262+
// performant and robust.
274263

275264
// Search directly in APKs first
276265
List<String> apkPaths = new ArrayList();
@@ -287,8 +276,8 @@ public void loadDartLibrary(String moduleName, int loadingUnitId) {
287276
continue;
288277
}
289278
String name = file.getName();
290-
if (name.substring(name.length() - 4).equals(".apk")
291-
&& name.substring(0, moduleName.length()).equals(moduleName)
279+
if (name.endsWith(".apk")
280+
&& name.startsWith(moduleName)
292281
&& name.contains(pathAbi)) {
293282
apkPaths.add(file.getAbsolutePath());
294283
continue;

‎shell/platform/android/platform_view_android.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ Dart_Handle PlatformViewAndroid::OnDartLoadLibrary(intptr_t loading_unit_id) {
354354
void PlatformViewAndroid::CompleteDartLoadLibrary(
355355
intptr_t loading_unit_id,
356356
std::string lib_name,
357-
std::vector<std::string>& apkPaths,
357+
const std::vector<std::string>& apkPaths,
358358
std::string abi) {
359359
delegate_.CompleteDartLoadLibrary(loading_unit_id, lib_name, apkPaths, abi);
360360
}

‎shell/platform/android/platform_view_android.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class PlatformViewAndroid final : public PlatformView {
9999
// |PlatformView|
100100
void CompleteDartLoadLibrary(intptr_t loading_unit_id,
101101
std::string lib_name,
102-
std::vector<std::string>& apkPaths,
102+
const std::vector<std::string>& apkPaths,
103103
std::string abi) override;
104104

105105
// |PlatformView|

0 commit comments

Comments
 (0)