Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions plugin/src/main/java/org/fbluemle/adbstart/AdbStartPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,17 @@ public void apply(Project project) {
Method getApplicationId = variant.getClass().getMethod("getApplicationId");
String applicationId = String.valueOf(getApplicationId.invoke(variant));

Method getNamespace = variant.getClass().getMethod("getNamespace");
String namespace = String.valueOf(getNamespace.invoke(variant));
// Try to get namespace from android extension, fall back to applicationId if not available
String namespace = applicationId;
try {
Method getNamespace = android.getClass().getMethod("getNamespace");
Object namespaceObj = getNamespace.invoke(android);
if (namespaceObj != null) {
namespace = String.valueOf(namespaceObj);
}
} catch (NoSuchMethodException e) {
// namespace not available in older AGP versions, use applicationId
}

String activity = ext.getActivity();
String activityClassName = (activity != null && activity.startsWith("."))
Expand Down