diff --git a/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java b/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java index dbd10ccb1..a0938f3cc 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/Netstat.java @@ -32,7 +32,7 @@ import java.util.regex.Pattern; *

* 1000 0 54165785 4 cd1e6040 25 4 27 3 -1 * | | | | | | | | | |--> slow start size threshold, - * | | | | | | | | | or -1 if the treshold + * | | | | | | | | | or -1 if the threshold * | | | | | | | | | is >= 0xFFFF * | | | | | | | | |----> sending congestion window * | | | | | | | |-------> (ack.quick<<1)|ack.pingpong @@ -111,7 +111,7 @@ public class Netstat { */ /** - * Method used to question for the connections currently openned + * Method used to question for the connections currently opened * * @return The list of connections (as Connection objects) */ @@ -119,7 +119,7 @@ public class Netstat { final ArrayList net = new ArrayList<>(); - // read from /proc/net/tcp the list of currently openned socket connections + // read from /proc/net/tcp the list of currently opened socket connections try { BufferedReader in = new BufferedReader(new FileReader("/proc/net/tcp")); String line; @@ -152,7 +152,7 @@ public class Netstat { // ignored } - // read from /proc/net/udp the list of currently openned socket connections + // read from /proc/net/udp the list of currently opened socket connections try { BufferedReader in = new BufferedReader(new FileReader("/proc/net/udp")); String line; @@ -185,7 +185,7 @@ public class Netstat { // ignored } - // read from /proc/net/raw the list of currently openned socket connections + // read from /proc/net/raw the list of currently opened socket connections try { BufferedReader in = new BufferedReader(new FileReader("/proc/net/raw")); String line; @@ -222,7 +222,7 @@ public class Netstat { } /** - * Informations about a given connection + * Information about a given connection * * @author Ciprian Dobre */ diff --git a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java index e53fc239b..d7ec5fda3 100644 --- a/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java +++ b/app/src/basic/java/org/fdroid/fdroid/views/main/MainViewController.java @@ -86,7 +86,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/main/java/org/fdroid/fdroid/FDroidApp.java b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java index dc0c1ba25..b19ffc231 100644 --- a/app/src/main/java/org/fdroid/fdroid/FDroidApp.java +++ b/app/src/main/java/org/fdroid/fdroid/FDroidApp.java @@ -501,7 +501,7 @@ public class FDroidApp extends Application implements androidx.work.Configuratio } /** - * Put proxy settings (or Tor settings) globally into effect based on whats configured in Preferences. + * Put proxy settings (or Tor settings) globally into effect based on what's configured in Preferences. *

* Must be called on App startup and after every proxy configuration change. */ diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index 9690e89c2..0dc165442 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -172,7 +172,7 @@ public class App implements Comparable, Parcelable { /** * Unlike other public fields, this is only accessible via a getter, to - * emphasise that setting it wont do anything. + * emphasise that setting it won't do anything. */ private String autoInstallVersionName; diff --git a/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java b/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java index 1fa5e1597..1716e14e3 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java +++ b/app/src/main/java/org/fdroid/fdroid/data/SanitizedFile.java @@ -30,7 +30,7 @@ public class SanitizedFile extends File { /** * Used by the {@link org.fdroid.fdroid.data.SanitizedFile#knownSanitized(java.io.File)} * method, but intentionally kept private so people don't think that any sanitization - * will occur by passing a file in - because it wont. + * will occur by passing a file in - because it won't. */ private SanitizedFile(File file) { super(file.getAbsolutePath()); diff --git a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java index 7b09575ae..1f30bf460 100644 --- a/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java +++ b/app/src/main/java/org/fdroid/fdroid/nearby/httpish/Response.java @@ -30,7 +30,7 @@ public class Response { /** * This class expects 'contentStream' to be open, and ready for use. - * It will not close it either. However it will block wile doing things + * It will not close it either. However it will block while doing things * so you can call a method, wait for it to finish, and then close * it afterwards if you like. */ diff --git a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java index 577d2912f..ada3ef9e0 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -896,7 +896,7 @@ public class AppDetailsRecyclerViewAdapter } /** - * Show a dialog to the user explaining the reaons there are no compatible versions. + * Show a dialog to the user explaining the reasons there are no compatible versions. * This will either be due to device features (e.g. NFC, API levels, etc) or being signed * by a different certificate (as is often the case with apps from Google Play signed by * upstream). diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java index b3407ccac..f0abf3000 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/LatestAdapter.java @@ -59,7 +59,7 @@ public class LatestAdapter extends RecyclerView.Adapter { layout = R.layout.app_card_list_item; break; default: - throw new IllegalArgumentException("Unknown view type when rendering \"Whats New\": " + viewType); + throw new IllegalArgumentException("Unknown view type when rendering \"What's New\": " + viewType); } return new AppCardController(activity, activity.getLayoutInflater().inflate(layout, parent, false)); diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java index 2acef3882..de1073611 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java @@ -61,7 +61,7 @@ import org.fdroid.fdroid.views.apps.AppListActivity; * Main view shown to users upon starting F-Droid. *

* Shows a bottom navigation bar, with the following entries: - * + Whats new + * + What's new * + Categories list * + App swap * + Updates diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java index 0710b8fcc..bb1e7fed4 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java +++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesItemTouchCallback.java @@ -14,7 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; * *