Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'typo-fixes' into 'master'

Browse Source 
Fix Typos

See merge request fdroid/fdroidclient!826
This commit is contained in:
Hans-Christoph Steiner 2019-06-11 12:11:03 +00:00
commit 1f565d7638
15 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/androidTest/java/org/fdroid/fdroid/CleanCacheServiceTest.java
View File

@ -57,9 +57,9 @@ public class CleanCacheServiceTest {
assertFalse(first.exists());
assertFalse(second.exists());
// make sure it doesn't freak out on a non-existant file
File nonexistant = new File(tempDir, "nonexistant");
CleanCacheService.clearOldFiles(nonexistant, 1);
// make sure it doesn't freak out on a non-existent file
File nonexistent = new File(tempDir, "nonexistent");
CleanCacheService.clearOldFiles(nonexistent, 1);
CleanCacheService.clearOldFiles(null, 1);
}
}

6
app/src/androidTest/java/org/fdroid/fdroid/Netstat.java
View File

@ -141,7 +141,7 @@ public class Netstat {
try {
c.setStatus(STATES[Integer.parseInt(statusHexa, 16) - 1]);
} catch (Exception ex) {
c.setStatus(STATES[11]); // unknwon
c.setStatus(STATES[11]); // unknown
}
c.setPID(-1); // unknown
c.setPName("UNKNOWN");
@ -174,7 +174,7 @@ public class Netstat {
try {
c.setStatus(STATES[Integer.parseInt(statusHexa, 16) - 1]);
} catch (Exception ex) {
c.setStatus(STATES[11]); // unknwon
c.setStatus(STATES[11]); // unknown
}
c.setPID(-1); // unknown
c.setPName("UNKNOWN");
@ -208,7 +208,7 @@ public class Netstat {
try {
c.setStatus(STATES[Integer.parseInt(statusHexa, 16) - 1]);
} catch (Exception ex) {
c.setStatus(STATES[11]); // unknwon
c.setStatus(STATES[11]); // unknown
}
c.setPID(-1); // unknown
c.setPName("UNKNOWN");

2
app/src/androidTest/java/org/fdroid/fdroid/UiWatchers.java
View File

@ -117,7 +117,7 @@ public class UiWatchers {
return false; // no trigger
}
});
Log.i(LOG_TAG, "Registed GUI Exception watchers");
Log.i(LOG_TAG, "Registered GUI Exception watchers");
}
public void onAnrDetected(String errorText) {

2
app/src/full/java/kellinwood/security/zipsigner/optional/KeyStoreFileManager.java
View File

@ -113,7 +113,7 @@ public class KeyStoreFileManager {
File keystoreFile = new File(keystorePath);
try {
if (keystoreFile.exists()) {
// I've had some trouble saving new verisons of the keystore file in which the file becomes empty/corrupt.
// I've had some trouble saving new versions of the keystore file in which the file becomes empty/corrupt.
// Saving the new version to a new file and creating a backup of the old version.
File tmpFile = File.createTempFile(keystoreFile.getName(), null, keystoreFile.getParentFile());
FileOutputStream fos = new FileOutputStream(tmpFile);

2
app/src/full/java/org/fdroid/fdroid/localrepo/SDCardScannerService.java
View File

@ -47,7 +47,7 @@ import java.util.List;
/**
* An {@link IntentService} subclass for scanning removable "external storage"
* for F-Droid package repos, e.g. SD Cards. This is intented to support
* for F-Droid package repos, e.g. SD Cards. This is intended to support
* 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

2
app/src/main/java/org/fdroid/fdroid/data/RepoPersister.java
View File

@ -72,7 +72,7 @@ public class RepoPersister {
private void flushBufferToDb() throws IndexUpdater.UpdateException {
if (!hasBeenInitialized) {
// This is where we will store all of the metadata before commiting at the
// This is where we will store all of the metadata before committing at the
// end of the process. This is due to the fact that we can't verify the cert
// the index was signed with until we've finished reading it - and we don't
// want to put stuff in the real database until we are sure it is from a

2
app/src/main/java/org/fdroid/fdroid/net/Downloader.java
View File

@ -140,7 +140,7 @@ public abstract class Downloader {
/**
* After every network operation that could take a while, we will check if an
* interrupt occured during that blocking operation. The goal is to ensure we
* interrupt occurred during that blocking operation. The goal is to ensure we
* don't move onto another slow, network operation if we have cancelled the
* download.
*

2
app/src/main/java/org/fdroid/fdroid/views/AppDetailsActivity.java
View File

@ -517,7 +517,7 @@ public class AppDetailsActivity extends AppCompatActivity
// wait for that service to notify us, and then we will respond in appObserver.
// Having said that, there are some cases where the PackageManager doesn't
// return control back to us until after it has already braodcast to the
// return control back to us until after it has already broadcast to the
// InstalledAppProviderService. This means that we are not listening for any
// feedback from InstalledAppProviderService (we intentionally stop listening in
// onPause). Empirically, this happens when upgrading an app rather than a clean

2
app/src/main/java/org/fdroid/fdroid/views/OverscrollLinearLayoutManager.java
View File

@ -13,7 +13,7 @@ import android.util.AttributeSet;
public class OverscrollLinearLayoutManager extends LinearLayoutManager {
/**
* A listener interface to get overscroll infromation.
* A listener interface to get overscroll information.
*/
public interface OnOverscrollListener {
/**

2
app/src/main/java/org/fdroid/fdroid/views/PreferencesFragment.java
View File

@ -421,7 +421,7 @@ public class PreferencesFragment extends PreferenceFragment
/**
* If a user specifies they want to fetch updates automatically, then start the download of relevant
* updates as soon as they enable the feature.
* Also, if the user has the priv extention installed then change the label to indicate that it
* Also, if the user has the priv extension installed then change the label to indicate that it
* will actually _install_ apps, not just fetch their .apk file automatically.
*/
private void initAutoFetchUpdatesPreference() {

2
app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
View File

@ -223,7 +223,7 @@ public abstract class AppListItemController extends RecyclerView.ViewHolder {
* @param app The app that was swiped away
* @param updatesAdapter The adapter. Can be used for refreshing the adapter with adapter.refreshStatuses().
*
* @see #canDismiss() This must also be overriden and should return true.
* @see #canDismiss() This must also be overridden and should return true.
*/
protected void onDismissApp(@NonNull App app, UpdatesAdapter updatesAdapter) {
}

4
app/src/main/java/org/fdroid/fdroid/views/apps/CategoryTextWatcher.java
View File

@ -55,7 +55,7 @@ public class CategoryTextWatcher implements TextWatcher {
// right to the start. This could be if we are removing everything (in which case
// there is no text to span), or we are removing somewhere from after the category
// back to the start (in which case we've removed the category anyway and don't need
// to explicilty request it to be removed.
// to explicitly request it to be removed.
if (start == 0 && removingOrReplacing) {
return;
}
@ -119,7 +119,7 @@ public class CategoryTextWatcher implements TextWatcher {
/**
* Ensures that a {@link CategorySpan} is in {@param textToSpannify} if required.
* Will firstly remove all existing category spans, and then add back one if neccesary.
* Will firstly remove all existing category spans, and then add back one if necessary.
* In addition, also adds a {@link TtsSpan} to indicate to screen readers that the category
* span has semantic meaning representing a category.
*/

2
app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
View File

@ -95,7 +95,7 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
/**
* There are some statuses managed by {@link AppUpdateStatusManager} which we don't care about
* for the "Updates" view. For example Also, although this
* adapter does know about apps with updates availble, it does so by querying the database not
* adapter does know about apps with updates available, it does so by querying the database not
* by querying the app update status manager. As such, apps with the status
* {@link org.fdroid.fdroid.AppUpdateStatusManager.Status#UpdateAvailable} are not interesting here.
*/

2
app/src/main/res/layout/app_perms_summary.xml
View File

@ -14,7 +14,7 @@
limitations under the License.
-->
<!-- Describes permission item consisting of a group name and the list of permisisons under the group -->
<!-- Describes permission item consisting of a group name and the list of permissions under the group -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"

2
metadata/en-US/full_description.txt
View File

@ -12,7 +12,7 @@ F-Droid as your libre software app manager:
* Get notified when updates are available
* Optionally download and install updates automatically
* Keep track of older and beta versions
* Filter out apps uncompatible with the device
* Filter out apps incompatible with the device
* Find apps via categories and searchable descriptions
* Access associated URLs for donations, source code etc.
* Stay safe by checking repo index signatures and APK hashes