From 5af7cac4b7427f1d028a480aa5cb6c310f6d84d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Tue, 30 Dec 2014 23:48:36 +0100 Subject: [PATCH] Remove all trailing whitespaces in source files --- F-Droid/res/layout/addrepo.xml | 2 +- F-Droid/res/layout/app_details_header.xml | 1 - F-Droid/res/layout/appinfo.xml | 4 ++-- F-Droid/res/layout/repolisticons.xml | 4 ++-- F-Droid/res/xml/preferences.xml | 2 +- .../org/fdroid/fdroid/PreferencesActivity.java | 2 +- F-Droid/src/org/fdroid/fdroid/data/App.java | 2 +- .../fdroid/data/InstalledAppCacheUpdater.java | 2 +- .../org/fdroid/fdroid/installer/Installer.java | 2 +- .../views/fragments/CanUpdateAppsFragment.java | 4 ++-- build.gradle | 16 ++++++++-------- 11 files changed, 20 insertions(+), 21 deletions(-) diff --git a/F-Droid/res/layout/addrepo.xml b/F-Droid/res/layout/addrepo.xml index 665d4fe8c..50f3b2971 100644 --- a/F-Droid/res/layout/addrepo.xml +++ b/F-Droid/res/layout/addrepo.xml @@ -57,7 +57,7 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/F-Droid/res/layout/app_details_header.xml b/F-Droid/res/layout/app_details_header.xml index fe8ff6c66..7b693a739 100644 --- a/F-Droid/res/layout/app_details_header.xml +++ b/F-Droid/res/layout/app_details_header.xml @@ -95,4 +95,3 @@ - \ No newline at end of file diff --git a/F-Droid/res/layout/appinfo.xml b/F-Droid/res/layout/appinfo.xml index b567185c5..389acf75b 100644 --- a/F-Droid/res/layout/appinfo.xml +++ b/F-Droid/res/layout/appinfo.xml @@ -40,7 +40,7 @@ android:layout_marginTop="8sp" android:textSize="13sp" android:singleLine="false" /> - + - + + android:orientation="horizontal"> { * you need to change suggestedVercode to an apk which is in the apk table. */ private String suggestedVersion; - + public int suggestedVercode; public Date added; diff --git a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java index ae08f275b..1e862a82e 100644 --- a/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java +++ b/F-Droid/src/org/fdroid/fdroid/data/InstalledAppCacheUpdater.java @@ -169,6 +169,6 @@ public class InstalledAppCacheUpdater { notifyProviders(); } } - } + } } diff --git a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java index 0168acdc4..5fd7c57ec 100644 --- a/F-Droid/src/org/fdroid/fdroid/installer/Installer.java +++ b/F-Droid/src/org/fdroid/fdroid/installer/Installer.java @@ -96,7 +96,7 @@ abstract public class Installer { /** * Creates a new Installer for installing/deleting processes starting from * an Activity - * + * * @param activity * @param pm * @param callback diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java index aeb59e683..1632ce0eb 100644 --- a/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java +++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java @@ -60,7 +60,7 @@ public class CanUpdateAppsFragment extends AppListFragment { @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - + mUpdateAllButton.setOnClickListener(new OnClickListener() { @Override @@ -88,7 +88,7 @@ public class CanUpdateAppsFragment extends AppListFragment { * Copied from ListFragment and added Button on top of list. We do not use a * custom layout here, because this breaks the progress bar functionality of * ListFragment. - * + * * @param inflater * @param container * @param savedInstanceState diff --git a/build.gradle b/build.gradle index a4f78e52a..f19d4b391 100644 --- a/build.gradle +++ b/build.gradle @@ -70,8 +70,8 @@ project(':support-v4') { apply plugin: 'maven' - // The support-v4 library assumes certain things are defined in the - // root project (which is usually the android-support project, but + // The support-v4 library assumes certain things are defined in the + // root project (which is usually the android-support project, but // this time it is the F-Droid project. rootProject.ext.supportRepoOut = "" @@ -81,23 +81,23 @@ project(':support-v4') { * Finds a reference to the prefered Android SDK directory. * Ideally we'd use "android.plugin.sdkFolder" to find this, however this is * only possible if we apply the android application plugin. This is not ideal, - * because it will add a bunch of tasks to do with building an android app, + * because it will add a bunch of tasks to do with building an android app, * even tnough this build.gradle is not here to build F-Droid, it is here to * apply hacks to play nicely with various upstream projects. - * + * * Adapted from https://android.googlesource.com/platform/tools/base/+/c8b776289ace4189406b59a9a9c8c9de63271cb0/build-system/gradle/src/main/groovy/com/android/build/gradle/internal/SdkHandler.java * Copyright (C) 2014 The Android Open Source Project - * Licensed under the Apache License, Version 2.0 + * Licensed under the Apache License, Version 2.0 * http://www.apache.org/licenses/LICENSE-2.0i */ def findSdkPath() { - + Properties properties = new Properties() File propFile = file("local.properties") if (propFile.exists()) { propFile.withReader { properties.load(it) } } - + String sdkDirProp = properties.getProperty("sdk.dir"); if (sdkDirProp != null) { return new File(sdkDirProp) @@ -107,7 +107,7 @@ def findSdkPath() { if (envVar != null) { return new File(envVar); } - + String property = System.getProperty("android.home"); if (property != null) { return new File(property);