From bb9426763c1543d1045a73b31e3ae2bf106f9270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Sat, 7 Nov 2015 13:25:01 +0100 Subject: [PATCH] Remove

from comments These are written manually and mostly don't contain HTML. Some html is fine if you want to use links or markup, but

elements are just pointless and very seldom used. Be consistent in not using them. --- F-Droid/src/org/fdroid/fdroid/RepoPersister.java | 2 +- F-Droid/src/org/fdroid/fdroid/RepoUpdater.java | 2 +- F-Droid/src/org/fdroid/fdroid/compat/TabManager.java | 2 +- .../org/fdroid/fdroid/installer/PrivilegedInstaller.java | 8 ++++---- .../org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java | 2 +- .../fdroid/privileged/install/InstallExtension.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/F-Droid/src/org/fdroid/fdroid/RepoPersister.java b/F-Droid/src/org/fdroid/fdroid/RepoPersister.java index 57aba7d34..e67fa35ca 100644 --- a/F-Droid/src/org/fdroid/fdroid/RepoPersister.java +++ b/F-Droid/src/org/fdroid/fdroid/RepoPersister.java @@ -34,7 +34,7 @@ public class RepoPersister { * values changed in the index, some fields should not be updated. Rather, they should be * ignored, because they were explicitly set by the user, and hence can't be automatically * overridden by the index. - *

+ * * NOTE: In the future, these attributes will be moved to a join table, so that the app table * is essentially completely transient, and can be nuked at any time. */ diff --git a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java index 332a9832b..2805baba7 100644 --- a/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/RepoUpdater.java @@ -37,7 +37,7 @@ import javax.xml.parsers.SAXParserFactory; /** * Handles getting the index metadata for an app repo, then verifying the * signature on the index metdata, implementing as a JAR signature. - *

+ * * WARNING: this class is the central piece of the entire security model of * FDroid! Avoid modifying it when possible, if you absolutely must, be very, * very careful with the changes that you are making! diff --git a/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java b/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java index d2aeb4acd..524f1a2ad 100644 --- a/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java +++ b/F-Droid/src/org/fdroid/fdroid/compat/TabManager.java @@ -112,7 +112,7 @@ public class TabManager { * updated when we call setSelectedNavigationItem(), and they don't expose * the spinner via the API. So we go on a merry hunt for all spinners in * our view, and find the first one with an id of -1. - *

+ * * This is because the view hierarchy dictates that the action bar comes * before everything below it when traversing children, and also our spinner * on the first view (for the app categories) has an id, whereas the diff --git a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java index 86c0ce2e6..f447b29e4 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/PrivilegedInstaller.java @@ -53,7 +53,7 @@ import java.util.List; *

  • android.permission.INSTALL_PACKAGES
    • *
  • android.permission.DELETE_PACKAGES
    • * - *

    + * * Both permissions are protected by systemOrSignature (in newer versions: * system|signature) and only granted on F-Droid's install in the following * cases: @@ -63,7 +63,7 @@ import java.util.List; *

  • On Android < 4.4 also when moved into /system/app/
    • *
  • On Android >= 4.4 also when moved into /system/priv-app/
    • * - *

    + * * Sources for Android 4.4 change: * https://groups.google.com/forum/#!msg/android- * security-discuss/r7uL_OEMU5c/LijNHvxeV80J @@ -665,8 +665,8 @@ public class PrivilegedInstaller extends Installer { * {@link #installPackage(android.net.Uri, IPackageInstallObserver, int)} * if the system failed to install the package because it is attempting to define a * permission that is already defined by some existing package. - *

    - *

    The package name of the app which has already defined the permission is passed to + * + * The package name of the app which has already defined the permission is passed to * a {@link PackageInstallObserver}, if any, as the {@link #EXTRA_EXISTING_PACKAGE} * string extra; and the name of the permission being redefined is passed in the * {@link #EXTRA_EXISTING_PERMISSION} string extra. diff --git a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java index e2bb2f57f..7ea27bec2 100644 --- a/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java +++ b/F-Droid/src/org/fdroid/fdroid/localrepo/peers/BluetoothPeer.java @@ -42,7 +42,7 @@ public class BluetoothPeer implements Peer { /** * Return the fingerprint of the signing key, or {@code null} if it is not set. - *

    + * * This is not yet stored for Bluetooth connections. Once a device is connected to a bluetooth * socket, if we trust it enough to accept a fingerprint from it somehow, then we may as well * trust it enough to receive an index from it that contains a fingerprint we can use. diff --git a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java index 2caafc5a2..7308dcb94 100644 --- a/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java +++ b/F-Droid/src/org/fdroid/fdroid/privileged/install/InstallExtension.java @@ -208,11 +208,11 @@ abstract class InstallExtension { /** * NOTE: Only works with reboot - *

    + * * File observers on /system/priv-app/ have been removed because they don't work with the new * cluser-style layout. See * https://github.com/android/platform_frameworks_base/commit/84e71d1d61c53cd947becc7879e05947be681103 - *

    + * * Related stack overflow post: http://stackoverflow.com/q/26487750 */ @Override