mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-03 15:45:10 +00:00
Code Issues Releases Wiki Activity

Check plugin permissions before calling onCreate

Browse Source 
Otherwise if we call something in onCreate for which we don't (yet) have permission we get a permission violation
This commit is contained in:
Nicolas Fella
2021-03-20 21:14:43 +01:00
parent 1a5a60a722
commit 77d0b4aec9
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/kde/kdeconnect/Device.java
View File

@@ -754,25 +754,16 @@ public class Device implements BaseLink.PacketReceiver {
return false; return false;
} }
boolean success;
try {
success = plugin.onCreate();
} catch (Exception e) {
success = false;
Log.e("KDE/addPlugin", "plugin failed to load " + pluginKey, e);
}
plugins.put(pluginKey, plugin); plugins.put(pluginKey, plugin);
if (!plugin.checkRequiredPermissions()) { if (!plugin.checkRequiredPermissions()) {
Log.e("KDE/addPlugin", "No permission " + pluginKey); Log.e("KDE/addPlugin", "No permission " + pluginKey);
plugins.remove(pluginKey); plugins.remove(pluginKey);
pluginsWithoutPermissions.put(pluginKey, plugin); pluginsWithoutPermissions.put(pluginKey, plugin);
success = false; return false;
} else { } else {
Log.i("KDE/addPlugin", "Permissions OK " + pluginKey); Log.i("KDE/addPlugin", "Permissions OK " + pluginKey);
pluginsWithoutPermissions.remove(pluginKey); pluginsWithoutPermissions.remove(pluginKey);
if (plugin.checkOptionalPermissions()) { if (plugin.checkOptionalPermissions()) {
Log.i("KDE/addPlugin", "Optional Permissions OK " + pluginKey); Log.i("KDE/addPlugin", "Optional Permissions OK " + pluginKey);
pluginsWithoutOptionalPermissions.remove(pluginKey); pluginsWithoutOptionalPermissions.remove(pluginKey);
@@ -782,7 +773,12 @@ public class Device implements BaseLink.PacketReceiver {
} }
} }
return success; try {
return plugin.onCreate();
} catch (Exception e) {
Log.e("KDE/addPlugin", "plugin failed to load " + pluginKey, e);
return false;
}
} }
private synchronized boolean removePlugin(String pluginKey) { private synchronized boolean removePlugin(String pluginKey) {