diff --git a/CHANGELOG.md b/CHANGELOG.md
index 746014ce1..e0ec0c7d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -519,7 +519,7 @@
### 1.3-alpha4 (2018-07-13)
-* fix Data/WiFi preferences to properly schedule Updats
+* fix Data/WiFi preferences to properly schedule Updates
* fix Install/Uninstall events for clearer feedback
@@ -767,7 +767,7 @@
* Fix installing with Privileged Extension on 7.x
-* Detect app updates via sytem OTA updates (#819)
+* Detect app updates via system OTA updates (#819)
### 0.102.1 (2017-02-24)
@@ -989,7 +989,7 @@
* Don't request the "Write to external storage" permission on 4.4 and later
since it's not needed to use our own external app directory
-* Fix a crash occuring if the user triggered a repo update that got rid of
+* Fix a crash occurring if the user triggered a repo update that got rid of
more than 450 APKs at once
* Properly cache APK files on the SD card if configured this way
@@ -1052,7 +1052,7 @@
* Show when packages are installed but not via F-Droid (mismatching signature)
-* Fix possible backround crash concerning the category list change listener
+* Fix possible background crash concerning the category list change listener
* Add an option to check for repository updates less often
diff --git a/app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java b/app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
index 50bc30100..c177800b3 100644
--- a/app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
+++ b/app/src/full/java/cc/mvdan/accesspoint/WifiApControl.java
@@ -161,7 +161,7 @@ final public class WifiApControl {
}
// isWifiApEnabled returns whether the Wi-Fi AP is currently enabled.
- // If an error occured invoking the method via reflection, false is
+ // If an error occurred invoking the method via reflection, false is
// returned.
public boolean isWifiApEnabled() {
Object result = invokeQuietly(isWifiApEnabledMethod, wm);
@@ -186,7 +186,7 @@ final public class WifiApControl {
}
// getWifiApState returns the current Wi-Fi AP state.
- // If an error occured invoking the method via reflection, -1 is
+ // If an error occurred invoking the method via reflection, -1 is
// returned.
public int getWifiApState() {
Object result = invokeQuietly(getWifiApStateMethod, wm);
@@ -202,7 +202,7 @@ final public class WifiApControl {
}
// getWifiApConfiguration returns the current Wi-Fi AP configuration.
- // If an error occured invoking the method via reflection, null is
+ // If an error occurred invoking the method via reflection, null is
// returned.
public WifiConfiguration getWifiApConfiguration() {
Object result = invokeQuietly(getWifiApConfigurationMethod, wm);
@@ -222,7 +222,7 @@ final public class WifiApControl {
// configuration. If one is already running, start using the new
// configuration. You should call WifiManager.setWifiEnabled(false)
// yourself before calling this method.
- // If an error occured invoking the method via reflection, false is
+ // If an error occurred invoking the method via reflection, false is
// returned.
public boolean setWifiApEnabled(WifiConfiguration config, boolean enabled) {
Object result = invokeQuietly(setWifiApEnabledMethod, wm, config, enabled);
diff --git a/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java b/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
index c6dc4fdfa..d18b744b2 100644
--- a/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
+++ b/app/src/full/java/kellinwood/security/zipsigner/HexDumpEncoder.java
@@ -25,7 +25,7 @@ import java.io.IOException;
/**
* Produces the classic hex dump with an address column, hex data
- * section (16 bytes per row) and right-column printable character dislpay.
+ * section (16 bytes per row) and right-column printable character display.
*/
public class HexDumpEncoder {
diff --git a/app/src/full/java/kellinwood/zipio/ZioEntry.java b/app/src/full/java/kellinwood/zipio/ZioEntry.java
index e09db6ad9..1d25a1f18 100644
--- a/app/src/full/java/kellinwood/zipio/ZioEntry.java
+++ b/app/src/full/java/kellinwood/zipio/ZioEntry.java
@@ -514,7 +514,7 @@ public class ZioEntry implements Cloneable {
}
/*
- * Returns timetamp in Java format
+ * Returns timestamp in Java format
*/
public long getTime() {
int year = (int) (((modificationDate >> 9) & 0x007f) + 80);
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
index bcf0e3f19..ae56fb301 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/LocalRepoService.java
@@ -69,13 +69,13 @@ public class LocalRepoService extends IntentService {
Process.setThreadPriority(Process.THREAD_PRIORITY_LOWEST);
String[] packageNames = intent.getStringArrayExtra(EXTRA_PACKAGE_NAMES);
if (packageNames == null || packageNames.length == 0) {
- Utils.debugLog(TAG, "no packageNames found, quiting");
+ Utils.debugLog(TAG, "no packageNames found, quitting");
return;
}
Arrays.sort(packageNames);
if (Arrays.equals(currentlyProcessedApps, packageNames)) {
- Utils.debugLog(TAG, "packageNames list unchanged, quiting");
+ Utils.debugLog(TAG, "packageNames list unchanged, quitting");
return;
}
currentlyProcessedApps = packageNames;
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
index e479f3fa7..9b38e5c48 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SDCardScannerService.java
@@ -52,7 +52,7 @@ import androidx.core.content.ContextCompat;
* sharable package repos, so it ignores non-removable storage, like the fake
* emulated sdcard from devices with only built-in storage. This method will
* only ever allow for reading repos, never writing. It also will not work
- * for removeable storage devices plugged in via USB, since do not show up as
+ * for removable storage devices plugged in via USB, since do not show up as
* "External Storage"
*
* Scanning the removable storage requires that the user allowed it. This
@@ -126,7 +126,7 @@ public class SDCardScannerService extends IntentService {
}
if (files == null) {
- Utils.debugLog(TAG, "checkExternalStorage returned blank, F-Droid probaby doesn't have Storage perm!");
+ Utils.debugLog(TAG, "checkExternalStorage returned blank, F-Droid probably doesn't have Storage perm!");
return new File[0];
} else {
return files;
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
index dd6a4e586..71df5ba8a 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/SwapService.java
@@ -533,7 +533,7 @@ public class SwapService extends Service {
}
/**
- * Sets or resets the idel timer for {@link #TIMEOUT}ms, once the timer
+ * Sets or resets the idle timer for {@link #TIMEOUT}ms, once the timer
* expires, this service and all things that rely on it will be stopped.
*/
public void initTimer() {
@@ -620,4 +620,4 @@ public class SwapService extends Service {
activePeers.remove((Peer) intent.getParcelableExtra(BonjourManager.EXTRA_BONJOUR_PEER));
}
};
-}
\ No newline at end of file
+}
diff --git a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
index fe37a6161..6da7d53a2 100644
--- a/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
+++ b/app/src/full/java/org/fdroid/fdroid/views/main/MainViewController.java
@@ -81,7 +81,7 @@ class MainViewController extends RecyclerView.ViewHolder {
*
* Note: It is tricky to attach a {@link Fragment} to a view from this view holder. This is due
* to the way in which the {@link RecyclerView} will reuse existing views and ask us to
- * put a settings fragment in there at arbitrary times. Usually it wont be the same view we
+ * put a settings fragment in there at arbitrary times. Usually it won't be the same view we
* attached the fragment to last time, which causes weirdness. The solution is to use code from
* the com.lsjwzh.widget.recyclerviewpager.FragmentStatePagerAdapter which manages this.
* The code has been ported to {@link SettingsView}.
diff --git a/app/src/full/res/menu/swap_next.xml b/app/src/full/res/menu/swap_next.xml
index 3d6ce364b..5c4926d0e 100644
--- a/app/src/full/res/menu/swap_next.xml
+++ b/app/src/full/res/menu/swap_next.xml
@@ -6,7 +6,7 @@
android:title="@string/next"
android:titleCondensed="@string/next"/>
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 66384886d..430851471 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,7 +9,7 @@
3dp
+ applied. The collapsible lists have a little extra on the sides. -->
4dp
240dp
diff --git a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
index 23306f824..5ee7ec5de 100644
--- a/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
+++ b/app/src/testFull/java/org/fdroid/fdroid/nearby/LocalHTTPDTest.java
@@ -423,7 +423,7 @@ public class LocalHTTPDTest {
}
}
}
- Assert.assertEquals("The response status to a reqeuest with 'if-non-match=*' header should be NOT_MODIFIED(304), if the file exists",
+ Assert.assertEquals("The response status to a request with 'if-non-match=*' header should be NOT_MODIFIED(304), if the file exists",
304, status);
}
@@ -435,7 +435,7 @@ public class LocalHTTPDTest {
connection = (HttpURLConnection) url.openConnection();
connection.addRequestProperty("range", "bytes=10-20");
connection.addRequestProperty("if-none-match", "*");
- Assert.assertEquals("The response status to a reqeuest with 'if-non-match=*' header and 'range' header should be NOT_MODIFIED(304),"
+ Assert.assertEquals("The response status to a request with 'if-non-match=*' header and 'range' header should be NOT_MODIFIED(304),"
+ " if the file exists, because 'if-non-match' header should be given priority", 304, connection.getResponseCode());
} finally {
if (connection != null) {