From dcb1c3accd9257fb7d9b93eef131d5297b186040 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 22 Mar 2019 13:36:53 +0100 Subject: [PATCH 1/4] add flag to track localized apps for selecting in Latest tab --- .../main/java/org/fdroid/fdroid/data/App.java | 12 ++++++++++ .../java/org/fdroid/fdroid/data/DBHelper.java | 16 ++++++++++++- .../java/org/fdroid/fdroid/data/Schema.java | 24 +++++++++++++------ .../fdroid/updater/IndexV1UpdaterTest.java | 1 + 4 files changed, 45 insertions(+), 8 deletions(-) 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 b2ea39190..c3ae71fa7 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -98,6 +98,8 @@ public class App extends ValueObject implements Comparable, Parcelable { public String preferredSigner; @JsonIgnore public boolean isApk; + @JsonIgnore + private boolean isLocalized = false; /** * This is primarily for the purpose of saving app metadata when parsing an index.xml file. @@ -349,6 +351,9 @@ public class App extends ValueObject implements Comparable, Parcelable { case Cols.IS_APK: isApk = cursor.getInt(i) == 1; break; + case Cols.IS_LOCALIZED: + isLocalized = cursor.getInt(i) == 1; + break; case Cols.InstalledApp.VERSION_CODE: installedVersionCode = cursor.getInt(i); break; @@ -468,6 +473,10 @@ public class App extends ValueObject implements Comparable, Parcelable { */ @JsonProperty("localized") private void setLocalized(Map> localized) { // NOPMD + if (localized.size() > 1) { + isLocalized = true; + } + Locale defaultLocale = Locale.getDefault(); String languageTag = defaultLocale.getLanguage(); String countryTag = defaultLocale.getCountry(); @@ -953,6 +962,7 @@ public class App extends ValueObject implements Comparable, Parcelable { values.put(Cols.WEAR_SCREENSHOTS, Utils.serializeCommaSeparatedString(wearScreenshots)); values.put(Cols.IS_COMPATIBLE, compatible ? 1 : 0); values.put(Cols.IS_APK, isApk ? 1 : 0); + values.put(Cols.IS_LOCALIZED, isLocalized ? 1 : 0); return values; } @@ -1178,6 +1188,7 @@ public class App extends ValueObject implements Comparable, Parcelable { dest.writeStringArray(this.tvScreenshots); dest.writeStringArray(this.wearScreenshots); dest.writeByte(this.isApk ? (byte) 1 : (byte) 0); + dest.writeByte(this.isLocalized ? (byte) 1 : (byte) 0); dest.writeString(this.installedVersionName); dest.writeInt(this.installedVersionCode); dest.writeParcelable(this.installedApk, flags); @@ -1229,6 +1240,7 @@ public class App extends ValueObject implements Comparable, Parcelable { this.tvScreenshots = in.createStringArray(); this.wearScreenshots = in.createStringArray(); this.isApk = in.readByte() != 0; + this.isLocalized = in.readByte() != 0; this.installedVersionName = in.readString(); this.installedVersionCode = in.readInt(); this.installedApk = in.readParcelable(Apk.class.getClassLoader()); diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 4444c88f3..43f85276d 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -169,6 +169,7 @@ public class DBHelper extends SQLiteOpenHelper { + AppMetadataTable.Cols.TV_SCREENSHOTS + " string," + AppMetadataTable.Cols.WEAR_SCREENSHOTS + " string," + AppMetadataTable.Cols.IS_APK + " boolean," + + AppMetadataTable.Cols.IS_LOCALIZED + " boolean," + "primary key(" + AppMetadataTable.Cols.PACKAGE_ID + ", " + AppMetadataTable.Cols.REPO_ID + "));"; private static final String CREATE_TABLE_APP_PREFS = "CREATE TABLE " + AppPrefsTable.NAME @@ -224,7 +225,7 @@ public class DBHelper extends SQLiteOpenHelper { + "primary key(" + ApkAntiFeatureJoinTable.Cols.APK_ID + ", " + ApkAntiFeatureJoinTable.Cols.ANTI_FEATURE_ID + ") " + " );"; - protected static final int DB_VERSION = 80; + protected static final int DB_VERSION = 81; private final Context context; @@ -450,6 +451,19 @@ public class DBHelper extends SQLiteOpenHelper { addUserMirrorsFields(db, oldVersion); removeNotNullFromVersionName(db, oldVersion); addDisabledMirrorsFields(db, oldVersion); + addIsLocalized(db, oldVersion); + } + + private void addIsLocalized(SQLiteDatabase db, int oldVersion) { + if (oldVersion >= 81) { + return; + } + if (!columnExists(db, AppMetadataTable.NAME, AppMetadataTable.Cols.IS_LOCALIZED)) { + Utils.debugLog(TAG, "Adding " + AppMetadataTable.Cols.IS_LOCALIZED + " field to " + + AppMetadataTable.NAME + " table in db."); + db.execSQL("alter table " + AppMetadataTable.NAME + " add column " + + AppMetadataTable.Cols.IS_LOCALIZED + " boolean;"); + } } private void addDisabledMirrorsFields(SQLiteDatabase db, int oldVersion) { diff --git a/app/src/main/java/org/fdroid/fdroid/data/Schema.java b/app/src/main/java/org/fdroid/fdroid/data/Schema.java index bdb8c01d8..d6bba529e 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Schema.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Schema.java @@ -12,11 +12,13 @@ public interface Schema { /** * A package is essentially the app that a developer builds and wants you to install on your * device. It differs from entries in: - * * {@link ApkTable} because they are specific builds of a particular package. Many different - * builds of the same package can exist. - * * {@link AppMetadataTable} because this is metdata about a package which is specified by a - * given repo. Different repos can provide the same package with different descriptions, - * categories, etc. + *
    + *
  • {@link ApkTable} because they are specific builds of a particular package. Many different + * builds of the same package can exist.
    • + *
  • {@link AppMetadataTable} because this is metdata about a package which is specified by a + * given repo. Different repos can provide the same package with different descriptions, + * categories, etc.
    • + *
*/ interface PackageTable { @@ -78,6 +80,7 @@ public interface Schema { * An entry in this table signifies that an app is in a particular category. Each repo can * classify its apps in separate categories, and so the same record in {@link PackageTable} * can be in the same category multiple times, if multiple repos think that is the case. + * * @see CategoryTable * @see AppMetadataTable */ @@ -90,12 +93,14 @@ public interface Schema { /** * Foreign key to {@link AppMetadataTable}. + * * @see AppMetadataTable */ String APP_METADATA_ID = "appMetadataId"; /** * Foreign key to {@link CategoryTable}. + * * @see CategoryTable */ String CATEGORY_ID = "categoryId"; @@ -121,6 +126,7 @@ public interface Schema { /** * An entry in this table signifies that an apk has a particular anti feature. + * * @see AntiFeatureTable * @see ApkTable */ @@ -131,12 +137,14 @@ public interface Schema { interface Cols { /** * Foreign key to {@link ApkTable}. + * * @see ApkTable */ String APK_ID = "apkId"; /** * Foreign key to {@link AntiFeatureTable}. + * * @see AntiFeatureTable */ String ANTI_FEATURE_ID = "antiFeatureId"; @@ -199,6 +207,7 @@ public interface Schema { String TV_SCREENSHOTS = "tvScreenshots"; String WEAR_SCREENSHOTS = "wearScreenshots"; String IS_APK = "isApk"; + String IS_LOCALIZED = "isLocalized"; interface SuggestedApk { String VERSION_NAME = "suggestedApkVersion"; @@ -238,12 +247,13 @@ public interface Schema { ANTI_FEATURES, REQUIREMENTS, ICON_URL, FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS, SEVEN_INCH_SCREENSHOTS, TEN_INCH_SCREENSHOTS, TV_SCREENSHOTS, WEAR_SCREENSHOTS, - PREFERRED_SIGNER, SUGGESTED_VERSION_CODE, IS_APK, + PREFERRED_SIGNER, SUGGESTED_VERSION_CODE, IS_APK, IS_LOCALIZED, }; /** * Superset of {@link Cols#ALL_COLS} including fields from other tables and also an alias * to satisfy the Android requirement for an "_ID" field. + * * @see Cols#ALL_COLS */ String[] ALL = { @@ -254,7 +264,7 @@ public interface Schema { ANTI_FEATURES, REQUIREMENTS, ICON_URL, FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS, SEVEN_INCH_SCREENSHOTS, TEN_INCH_SCREENSHOTS, TV_SCREENSHOTS, WEAR_SCREENSHOTS, - PREFERRED_SIGNER, SUGGESTED_VERSION_CODE, IS_APK, SuggestedApk.VERSION_NAME, + PREFERRED_SIGNER, SUGGESTED_VERSION_CODE, IS_APK, IS_LOCALIZED, SuggestedApk.VERSION_NAME, InstalledApp.VERSION_CODE, InstalledApp.VERSION_NAME, InstalledApp.SIGNATURE, Package.PACKAGE_NAME, }; diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java index 986e74285..22bc9efcc 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java @@ -347,6 +347,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest { "installedVersionCode", "installedVersionName", "isApk", + "isLocalized", "preferredSigner", "prefs", "TAG", From 3862f941e6980a40a2990b60eaefb09325197aec Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 22 Mar 2019 13:24:28 +0100 Subject: [PATCH 2/4] add new criteria for apps shown in Latest tab This adds requirements before an app is shown on the Latest tab. It must have all of these: * name * summary * description * license * What's New entry * at least some text localized And then it must have at least one of these: * screenshots * feature graphic --- .../fdroid/views/main/WhatsNewViewBinder.java | 27 ++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java index 47da7ac2c..2bb288385 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java +++ b/app/src/main/java/org/fdroid/fdroid/views/main/WhatsNewViewBinder.java @@ -23,12 +23,13 @@ import org.fdroid.fdroid.UpdateService; import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.data.AppProvider; import org.fdroid.fdroid.data.RepoProvider; -import org.fdroid.fdroid.data.Schema; +import org.fdroid.fdroid.data.Schema.AppMetadataTable; import org.fdroid.fdroid.views.apps.AppListActivity; import org.fdroid.fdroid.views.hiding.HidingManager; import org.fdroid.fdroid.views.whatsnew.WhatsNewAdapter; import java.util.Date; +import java.util.Locale; /** * Loads a list of newly added or recently updated apps and displays them to the user. @@ -100,11 +101,31 @@ class WhatsNewViewBinder implements LoaderManager.LoaderCallbacks { return null; } + // select that have all required items: + String selection = "(" + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.NAME + " != ''" + + " AND " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.SUMMARY + " != ''" + + " AND " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.DESCRIPTION + " != ''" + + " AND " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.LICENSE + " != ''" + + " AND " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.WHATSNEW + " != ''"; + if (!"en".equals(Locale.getDefault().getLanguage())) { + // only require localization if using a non-English locale + selection += " AND " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.IS_LOCALIZED + " = 1"; + } + // and at least one optional item: + selection += ") AND (" + + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.SEVEN_INCH_SCREENSHOTS + " IS NOT NULL " + + " OR " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.PHONE_SCREENSHOTS + " IS NOT NULL " + + " OR " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.TEN_INCH_SCREENSHOTS + " IS NOT NULL " + + " OR " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.TV_SCREENSHOTS + " IS NOT NULL " + + " OR " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.WEAR_SCREENSHOTS + " IS NOT NULL " + + " OR " + AppMetadataTable.NAME + "." + AppMetadataTable.Cols.FEATURE_GRAPHIC + " IS NOT NULL " + + ")"; + return new CursorLoader( activity, AppProvider.getRecentlyUpdatedUri(), - Schema.AppMetadataTable.Cols.ALL, - null, + AppMetadataTable.Cols.ALL, + selection, null, null ); From 4f1855c8a1b7ecd280ab7ccd154bf92fec1a0bac Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 22 Mar 2019 15:22:11 +0100 Subject: [PATCH 3/4] App Details: show the app's Translation links fdroid/fdroidserver!450 icon is: https://material.io/tools/icons/?search=trans&icon=translate&style=baseline --- .../main/java/org/fdroid/fdroid/data/App.java | 8 ++++++++ .../java/org/fdroid/fdroid/data/DBHelper.java | 16 +++++++++++++++- .../main/java/org/fdroid/fdroid/data/Schema.java | 5 +++-- .../views/AppDetailsRecyclerViewAdapter.java | 5 +++++ app/src/main/res/drawable/ic_translation.xml | 9 +++++++++ app/src/main/res/values/strings.xml | 7 +++++++ .../fdroid/updater/IndexV1UpdaterTest.java | 1 + 7 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/drawable/ic_translation.xml 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 c3ae71fa7..23bf8af20 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -146,6 +146,8 @@ public class App extends ValueObject implements Comparable, Parcelable { public String sourceCode; + public String translation; + public String video; public String changelog; @@ -273,6 +275,9 @@ public class App extends ValueObject implements Comparable, Parcelable { case Cols.SOURCE_CODE: sourceCode = cursor.getString(i); break; + case Cols.TRANSLATION: + translation = cursor.getString(i); + break; case Cols.VIDEO: video = cursor.getString(i); break; @@ -936,6 +941,7 @@ public class App extends ValueObject implements Comparable, Parcelable { values.put(Cols.WEBSITE, webSite); values.put(Cols.ISSUE_TRACKER, issueTracker); values.put(Cols.SOURCE_CODE, sourceCode); + values.put(Cols.TRANSLATION, translation); values.put(Cols.VIDEO, video); values.put(Cols.CHANGELOG, changelog); values.put(Cols.DONATE, donate); @@ -1161,6 +1167,7 @@ public class App extends ValueObject implements Comparable, Parcelable { dest.writeString(this.webSite); dest.writeString(this.issueTracker); dest.writeString(this.sourceCode); + dest.writeString(this.translation); dest.writeString(this.video); dest.writeString(this.changelog); dest.writeString(this.donate); @@ -1211,6 +1218,7 @@ public class App extends ValueObject implements Comparable, Parcelable { this.webSite = in.readString(); this.issueTracker = in.readString(); this.sourceCode = in.readString(); + this.translation = in.readString(); this.video = in.readString(); this.changelog = in.readString(); this.donate = in.readString(); diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java index 43f85276d..0a411e211 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java +++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java @@ -143,6 +143,7 @@ public class DBHelper extends SQLiteOpenHelper { + AppMetadataTable.Cols.WEBSITE + " text, " + AppMetadataTable.Cols.ISSUE_TRACKER + " text, " + AppMetadataTable.Cols.SOURCE_CODE + " text, " + + AppMetadataTable.Cols.TRANSLATION + " text, " + AppMetadataTable.Cols.VIDEO + " string, " + AppMetadataTable.Cols.CHANGELOG + " text, " + AppMetadataTable.Cols.PREFERRED_SIGNER + " text," @@ -225,7 +226,7 @@ public class DBHelper extends SQLiteOpenHelper { + "primary key(" + ApkAntiFeatureJoinTable.Cols.APK_ID + ", " + ApkAntiFeatureJoinTable.Cols.ANTI_FEATURE_ID + ") " + " );"; - protected static final int DB_VERSION = 81; + protected static final int DB_VERSION = 82; private final Context context; @@ -452,6 +453,19 @@ public class DBHelper extends SQLiteOpenHelper { removeNotNullFromVersionName(db, oldVersion); addDisabledMirrorsFields(db, oldVersion); addIsLocalized(db, oldVersion); + addTranslation(db, oldVersion); + } + + private void addTranslation(SQLiteDatabase db, int oldVersion) { + if (oldVersion >= 82) { + return; + } + if (!columnExists(db, AppMetadataTable.NAME, AppMetadataTable.Cols.TRANSLATION)) { + Utils.debugLog(TAG, "Adding " + AppMetadataTable.Cols.TRANSLATION + " field to " + + AppMetadataTable.NAME + " table in db."); + db.execSQL("alter table " + AppMetadataTable.NAME + " add column " + + AppMetadataTable.Cols.TRANSLATION + " string;"); + } } private void addIsLocalized(SQLiteDatabase db, int oldVersion) { diff --git a/app/src/main/java/org/fdroid/fdroid/data/Schema.java b/app/src/main/java/org/fdroid/fdroid/data/Schema.java index d6bba529e..7fecd916e 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/Schema.java +++ b/app/src/main/java/org/fdroid/fdroid/data/Schema.java @@ -182,6 +182,7 @@ public interface Schema { String WEBSITE = "webURL"; String ISSUE_TRACKER = "trackerURL"; String SOURCE_CODE = "sourceURL"; + String TRANSLATION = "translation"; String VIDEO = "video"; String CHANGELOG = "changelogURL"; String DONATE = "donateURL"; @@ -242,7 +243,7 @@ public interface Schema { String[] ALL_COLS = { ROW_ID, PACKAGE_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION, WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE, - VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID, + TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID, UPSTREAM_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED, ANTI_FEATURES, REQUIREMENTS, ICON_URL, FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS, @@ -259,7 +260,7 @@ public interface Schema { String[] ALL = { _ID, ROW_ID, REPO_ID, IS_COMPATIBLE, NAME, SUMMARY, ICON, DESCRIPTION, WHATSNEW, LICENSE, AUTHOR_NAME, AUTHOR_EMAIL, WEBSITE, ISSUE_TRACKER, SOURCE_CODE, - VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID, + TRANSLATION, VIDEO, CHANGELOG, DONATE, BITCOIN, LITECOIN, FLATTR_ID, LIBERAPAY_ID, UPSTREAM_VERSION_NAME, UPSTREAM_VERSION_CODE, ADDED, LAST_UPDATED, ANTI_FEATURES, REQUIREMENTS, ICON_URL, FEATURE_GRAPHIC, PROMO_GRAPHIC, TV_BANNER, PHONE_SCREENSHOTS, 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 56f90a588..fc6800115 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java +++ b/app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java @@ -981,6 +981,11 @@ public class AppDetailsRecyclerViewAdapter addLinkItemView(contentView, R.string.menu_issues, R.drawable.ic_issues, app.issueTracker); } + // Translation button + if (uriIsSetAndCanBeOpened(app.translation)) { + addLinkItemView(contentView, R.string.menu_translation, R.drawable.ic_translation, app.translation); + } + // Changelog button if (uriIsSetAndCanBeOpened(app.changelog)) { addLinkItemView(contentView, R.string.menu_changelog, R.drawable.ic_changelog, app.changelog); diff --git a/app/src/main/res/drawable/ic_translation.xml b/app/src/main/res/drawable/ic_translation.xml new file mode 100644 index 000000000..0fd3dbba4 --- /dev/null +++ b/app/src/main/res/drawable/ic_translation.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 184caea76..06104328a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -210,11 +210,18 @@ This often occurs with apps installed via Google Play or other sources, if they Ignore This Update Website E-Mail Author + Issues + Changelog + Video + License: %s + Source Code + + Translation Update Downgrade Donate diff --git a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java index 22bc9efcc..dfda5d5f3 100644 --- a/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java +++ b/app/src/test/java/org/fdroid/fdroid/updater/IndexV1UpdaterTest.java @@ -329,6 +329,7 @@ public class IndexV1UpdaterTest extends FDroidProviderTest { "suggestedVersionName", "summary", "tenInchScreenshots", + "translation", "tvBanner", "tvScreenshots", "upstreamVersionCode", From 90d4821e99b334d25ddfac593540d43c694cc421 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 22 Mar 2019 15:25:03 +0100 Subject: [PATCH 4/4] fix checkstyle LineLength --- .../java/org/fdroid/fdroid/MainActivityEspressoTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java index 7cfc98ea0..3e23f3ed6 100644 --- a/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java +++ b/app/src/androidTest/java/org/fdroid/fdroid/MainActivityEspressoTest.java @@ -204,7 +204,8 @@ public class MainActivityEspressoTest { allOf(withText(R.string.main_menu__swap_nearby), isDisplayed())); nearbyBottonNavButton.perform(click()); ViewInteraction findPeopleButton = onView( - allOf(withId(R.id.find_people_button), withText(R.string.nearby_splash__find_people_button), isDisplayed())); + allOf(withId(R.id.find_people_button), withText(R.string.nearby_splash__find_people_button), + isDisplayed())); findPeopleButton.perform(click()); onView(withText(R.string.swap_send_fdroid)).check(matches(isDisplayed())); }