diff --git a/app/build.gradle b/app/build.gradle index 64b73d77b84..7439296fcd6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -197,7 +197,6 @@ dependencies { implementation 'io.reactivex.rxjava2:rxjava:2.2.2' implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1' - implementation 'org.ocpsoft.prettytime:prettytime:4.0.3.Final' implementation "androidx.room:room-runtime:${roomDbLibVersion}" implementation "androidx.room:room-rxjava2:${roomDbLibVersion}" diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 53a9ecd5a10..6b56e1c75a9 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,7 +18,6 @@ -dontobfuscate -keep class org.schabi.newpipe.extractor.timeago.patterns.** { *; } --keep class org.ocpsoft.prettytime.i18n.** { *; } -keep class org.mozilla.javascript.** { *; } diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java index 2fb8ac7f7ad..e8e24ac261a 100644 --- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java +++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java @@ -57,8 +57,6 @@ public class AboutActivity extends AppCompatActivity { "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2), new SoftwareComponent("RxBinding", "2015 - 2018", "Jake Wharton", "https://github.com/JakeWharton/RxBinding", StandardLicenses.APACHE2), - new SoftwareComponent("PrettyTime", "2012 - 2020", "Lincoln Baxter, III", - "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2), new SoftwareComponent("Markwon", "2017 - 2020", "Noties", "https://github.com/noties/Markwon", StandardLicenses.APACHE2), new SoftwareComponent("Groupie", "2016", "Lisa Wray", diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java index 7e336f02d5d..849588804c0 100644 --- a/app/src/main/java/org/schabi/newpipe/util/Localization.java +++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java @@ -7,14 +7,13 @@ import android.content.res.Resources; import android.preference.PreferenceManager; import android.text.TextUtils; +import android.text.format.DateUtils; import android.util.DisplayMetrics; import androidx.annotation.NonNull; import androidx.annotation.PluralsRes; import androidx.annotation.StringRes; -import org.ocpsoft.prettytime.PrettyTime; -import org.ocpsoft.prettytime.units.Decade; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.ListExtractor; import org.schabi.newpipe.extractor.localization.ContentCountry; @@ -53,12 +52,11 @@ public final class Localization { private static final String DOT_SEPARATOR = " • "; - private static PrettyTime prettyTime; private Localization() { } public static void init(final Context context) { - initPrettyTime(context); + } @NonNull @@ -290,24 +288,10 @@ public static String localizeDuration(final Context context, final int durationI } } - /*////////////////////////////////////////////////////////////////////////// - // Pretty Time - //////////////////////////////////////////////////////////////////////////*/ - - private static void initPrettyTime(final Context context) { - prettyTime = new PrettyTime(getAppLocale(context)); - // Do not use decades as YouTube doesn't either. - prettyTime.removeUnit(Decade.class); - } - - private static PrettyTime getPrettyTime() { - return prettyTime; - } - public static String relativeTime(final Calendar calendarTime) { - String time = getPrettyTime().formatUnrounded(calendarTime); - return time.startsWith("-") ? time.substring(1) : time; - //workaround fix for russian showing -1 day ago, -19hrs ago… + return DateUtils.getRelativeTimeSpanString( + calendarTime.getTimeInMillis(), System.currentTimeMillis(), + DateUtils.MINUTE_IN_MILLIS).toString(); } private static void changeAppLanguage(final Locale loc, final Resources res) {