diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java b/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java index 1091ba475..e16084f84 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/AndroidUtilities.java @@ -147,7 +147,6 @@ import java.util.regex.Pattern; import cn.hutool.core.util.StrUtil; import kotlin.Unit; import tw.nekomimi.nekogram.BottomBuilder; -import tw.nekomimi.nekogram.JalaliCalendar; import tw.nekomimi.nekogram.NekoConfig; import tw.nekomimi.nekogram.NekoXConfig; import tw.nekomimi.nekogram.utils.AlertUtil; @@ -997,7 +996,7 @@ public class AndroidUtilities { if (date.length > 0) { date = date[0].split("-"); if (date.length == 3) { - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.YEAR, Utilities.parseInt(date[0])); calendar.set(Calendar.MONTH, Utilities.parseInt(date[1]) - 1); calendar.set(Calendar.DAY_OF_MONTH, Utilities.parseInt(date[2])); diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java index 4b810c0a0..b2592d314 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/ApplicationLoader.java @@ -42,7 +42,6 @@ import java.util.Set; import tw.nekomimi.nekogram.ExternalGcm; import tw.nekomimi.nekogram.NekoConfig; import tw.nekomimi.nekogram.database.WarppedPref; -import tw.nekomimi.nekogram.parts.ProxySwitcher; import tw.nekomimi.nekogram.utils.EnvUtil; import tw.nekomimi.nekogram.utils.FileUtil; import tw.nekomimi.nekogram.utils.ProxyUtil; @@ -343,6 +342,12 @@ public class ApplicationLoader extends Application { applicationContext = getApplicationContext(); } + try { + Class.forName("org.robolectric.android.internal.AndroidTestEnvironment"); + return; + } catch (ClassNotFoundException e) { + } + NativeLoader.initNativeLibs(ApplicationLoader.applicationContext); ConnectionsManager.native_setJava(false); new ForegroundDetector(this) { diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java b/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java index e92f5d971..dae0bbc0e 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/LocaleController.java @@ -43,7 +43,6 @@ import java.util.HashMap; import java.util.Locale; import java.util.TimeZone; -import tw.nekomimi.nekogram.JalaliCalendar; import tw.nekomimi.nekogram.NekoConfig; import tw.nekomimi.nekogram.utils.FileUtil; @@ -1402,7 +1401,7 @@ public class LocaleController { public static String formatDateChat(long date, boolean checkYear) { try { - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(System.currentTimeMillis()); int currentYear = calendar.get(Calendar.YEAR); date *= 1000; @@ -1421,7 +1420,7 @@ public class LocaleController { public static String formatDate(long date) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int day = rightNow.get(Calendar.DAY_OF_YEAR); int year = rightNow.get(Calendar.YEAR); rightNow.setTimeInMillis(date); @@ -1446,7 +1445,7 @@ public class LocaleController { public static String formatDateAudio(long date, boolean shortFormat) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int day = rightNow.get(Calendar.DAY_OF_YEAR); int year = rightNow.get(Calendar.YEAR); rightNow.setTimeInMillis(date); @@ -1475,7 +1474,7 @@ public class LocaleController { public static String formatDateCallLog(long date) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int day = rightNow.get(Calendar.DAY_OF_YEAR); int year = rightNow.get(Calendar.YEAR); rightNow.setTimeInMillis(date); @@ -1500,7 +1499,7 @@ public class LocaleController { public static String formatLocationUpdateDate(long date) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int day = rightNow.get(Calendar.DAY_OF_YEAR); int year = rightNow.get(Calendar.YEAR); rightNow.setTimeInMillis(date); @@ -1549,7 +1548,7 @@ public class LocaleController { public static String formatDateOnline(long date) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int day = rightNow.get(Calendar.DAY_OF_YEAR); int year = rightNow.get(Calendar.YEAR); rightNow.setTimeInMillis(date); @@ -1638,7 +1637,7 @@ public class LocaleController { public static String formatSectionDate(long date) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int year = rightNow.get(Calendar.YEAR); rightNow.setTimeInMillis(date); int dateYear = rightNow.get(Calendar.YEAR); @@ -1672,7 +1671,7 @@ public class LocaleController { public static String formatDateForBan(long date) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int year = rightNow.get(Calendar.YEAR); rightNow.setTimeInMillis(date); int dateYear = rightNow.get(Calendar.YEAR); @@ -1691,7 +1690,7 @@ public class LocaleController { public static String stringForMessageListDate(long date) { try { date *= 1000; - Calendar rightNow = JalaliCalendar.mInstance(); + Calendar rightNow = Calendar.getInstance(); int day = rightNow.get(Calendar.DAY_OF_YEAR); rightNow.setTimeInMillis(date); int dateDay = rightNow.get(Calendar.DAY_OF_YEAR); diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/time/FastDatePrinter.java b/TMessagesProj/src/main/java/org/telegram/messenger/time/FastDatePrinter.java index f76a9fbea..82553263c 100644 --- a/TMessagesProj/src/main/java/org/telegram/messenger/time/FastDatePrinter.java +++ b/TMessagesProj/src/main/java/org/telegram/messenger/time/FastDatePrinter.java @@ -32,9 +32,6 @@ import java.util.TimeZone; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import tw.nekomimi.nekogram.JalaliCalendar; -import tw.nekomimi.nekogram.NekoConfig; - /** *

FastDatePrinter is a fast and thread-safe version of * {@link java.text.SimpleDateFormat}.

@@ -432,10 +429,8 @@ public class FastDatePrinter implements DatePrinter, Serializable { * * @return a new Calendar instance. */ - private Calendar newCalendar() { - if (NekoConfig.usePersianCalender) { - return new JalaliCalendar(mTimeZone, mLocale); - } + private GregorianCalendar newCalendar() { + // hard code GregorianCalendar return new GregorianCalendar(mTimeZone, mLocale); } diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java index 6baacefca..c1c696c5a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChannelAdminLogActivity.java @@ -29,11 +29,6 @@ import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import androidx.core.content.FileProvider; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.LinearSmoothScrollerCustom; -import androidx.recyclerview.widget.RecyclerView; - import android.text.TextUtils; import android.text.style.CharacterStyle; import android.text.style.ClickableSpan; @@ -55,6 +50,11 @@ import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; +import androidx.core.content.FileProvider; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScrollerCustom; +import androidx.recyclerview.widget.RecyclerView; + import com.google.android.exoplayer2.ui.AspectRatioFrameLayout; import org.telegram.messenger.AndroidUtilities; @@ -62,13 +62,13 @@ import org.telegram.messenger.BuildConfig; import org.telegram.messenger.BuildVars; import org.telegram.messenger.ChatObject; import org.telegram.messenger.ContactsController; -import org.telegram.messenger.ImageLocation; -import org.telegram.messenger.MediaDataController; import org.telegram.messenger.FileLoader; import org.telegram.messenger.FileLog; +import org.telegram.messenger.ImageLocation; import org.telegram.messenger.ImageReceiver; import org.telegram.messenger.LocaleController; import org.telegram.messenger.MediaController; +import org.telegram.messenger.MediaDataController; import org.telegram.messenger.MessageObject; import org.telegram.messenger.MessagesController; import org.telegram.messenger.NotificationCenter; @@ -115,9 +115,7 @@ import java.io.FileWriter; import java.util.ArrayList; import java.util.HashMap; -import tw.nekomimi.nekogram.JalaliCalendar; import tw.nekomimi.nekogram.NekoConfig; -import tw.nekomimi.nekogram.NekoXConfig; import tw.nekomimi.nekogram.utils.AlertUtil; public class ChannelAdminLogActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java index f140ead62..afa6e326a 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatActivity.java @@ -237,7 +237,6 @@ import java.util.regex.Pattern; import cn.hutool.core.util.StrUtil; import kotlin.Unit; import tw.nekomimi.nekogram.BottomBuilder; -import tw.nekomimi.nekogram.JalaliCalendar; import tw.nekomimi.nekogram.MessageDetailsActivity; import tw.nekomimi.nekogram.NekoConfig; import tw.nekomimi.nekogram.NekoXConfig; @@ -4612,7 +4611,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not if (floatingDateView.getAlpha() == 0 || actionBar.isActionModeShowed()) { return; } - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis((long) floatingDateView.getCustomDate() * 1000); int year = calendar.get(Calendar.YEAR); int monthOfYear = calendar.get(Calendar.MONTH); @@ -4628,13 +4627,13 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not return false; } AndroidUtilities.hideKeyboard(searchItem.getSearchField()); - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); int year = calendar.get(Calendar.YEAR); int monthOfYear = calendar.get(Calendar.MONTH); int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); try { DatePickerDialog dialog = new DatePickerDialog(getParentActivity(), (view1, year1, month, dayOfMonth1) -> { - Calendar calendar1 = JalaliCalendar.mInstance(); + Calendar calendar1 = Calendar.getInstance(); calendar1.clear(); calendar1.set(year1, month, dayOfMonth1); int date = (int) (calendar1.getTime().getTime() / 1000); @@ -11967,7 +11966,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not dateMsg.message = LocaleController.formatDateChat(obj.messageOwner.date); } dateMsg.id = 0; - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(((long) obj.messageOwner.date) * 1000); calendar.set(Calendar.HOUR_OF_DAY, 0); calendar.set(Calendar.MINUTE, 0); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java index 25355efbc..50b85606b 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/ChatRightsEditActivity.java @@ -67,7 +67,6 @@ import org.telegram.ui.Components.RecyclerListView; import java.util.ArrayList; import java.util.Calendar; -import tw.nekomimi.nekogram.JalaliCalendar; import tw.nekomimi.nekogram.utils.VibrateUtil; public class ChatRightsEditActivity extends BaseFragment { @@ -414,13 +413,13 @@ public class ChatRightsEditActivity extends BaseFragment { listViewAdapter.notifyItemChanged(untilDateRow); break; case 4: { - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); int year = calendar.get(Calendar.YEAR); int monthOfYear = calendar.get(Calendar.MONTH); int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); try { DatePickerDialog dialog = new DatePickerDialog(getParentActivity(), (view1, year1, month, dayOfMonth1) -> { - Calendar calendar1 = JalaliCalendar.mInstance(); + Calendar calendar1 = Calendar.getInstance(); calendar1.clear(); calendar1.set(year1, month, dayOfMonth1); final int time = (int) (calendar1.getTime().getTime() / 1000); @@ -441,7 +440,7 @@ public class ChatRightsEditActivity extends BaseFragment { final DatePicker datePicker = dialog.getDatePicker(); - Calendar date = JalaliCalendar.mInstance(); + Calendar date = Calendar.getInstance(); date.setTimeInMillis(System.currentTimeMillis()); date.set(Calendar.HOUR_OF_DAY, date.getMinimum(Calendar.HOUR_OF_DAY)); date.set(Calendar.MINUTE, date.getMinimum(Calendar.MINUTE)); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java index 625deaf67..d22e93276 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/Components/AlertsCreator.java @@ -102,7 +102,6 @@ import java.util.concurrent.CountDownLatch; import kotlin.Unit; import tw.nekomimi.nekogram.BottomBuilder; -import tw.nekomimi.nekogram.JalaliCalendar; import tw.nekomimi.nekogram.NekoConfig; import tw.nekomimi.nekogram.utils.VibrateUtil; @@ -857,7 +856,7 @@ public class AlertsCreator { } private static void updateDayPicker(NumberPicker dayPicker, NumberPicker monthPicker, NumberPicker yearPicker) { - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.MONTH, monthPicker.getValue()); calendar.set(Calendar.YEAR, yearPicker.getValue()); dayPicker.setMinValue(1); @@ -865,7 +864,7 @@ public class AlertsCreator { } private static void checkPickerDate(NumberPicker dayPicker, NumberPicker monthPicker, NumberPicker yearPicker) { - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(System.currentTimeMillis()); int currentYear = calendar.get(Calendar.YEAR); @@ -1461,7 +1460,7 @@ public class AlertsCreator { monthPicker.setMaxValue(11); linearLayout.addView(monthPicker, LayoutHelper.createLinear(0, LayoutHelper.WRAP_CONTENT, 0.3f)); monthPicker.setFormatter(value -> { - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.set(Calendar.DAY_OF_MONTH, 1); calendar.set(Calendar.MONTH, value); return calendar.getDisplayName(Calendar.MONTH, Calendar.SHORT, Locale.getDefault()); @@ -1473,7 +1472,7 @@ public class AlertsCreator { } }); - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(System.currentTimeMillis()); final int currentYear = calendar.get(Calendar.YEAR); yearPicker.setMinValue(currentYear + minYear); @@ -1516,7 +1515,7 @@ public class AlertsCreator { int hour = hourPicker.getValue(); int minute = minutePicker.getValue(); - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); long systemTime = System.currentTimeMillis(); calendar.setTimeInMillis(systemTime); int currentYear = calendar.get(Calendar.YEAR); @@ -1681,7 +1680,7 @@ public class AlertsCreator { container.addView(linearLayout, LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT)); long currentTime = System.currentTimeMillis(); - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(currentTime); int currentYear = calendar.get(Calendar.YEAR); diff --git a/TMessagesProj/src/main/java/org/telegram/ui/PassportActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/PassportActivity.java index 772962145..a01ab3a5f 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/PassportActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/PassportActivity.java @@ -138,7 +138,6 @@ import java.util.TimerTask; import javax.crypto.Cipher; -import tw.nekomimi.nekogram.JalaliCalendar; import tw.nekomimi.nekogram.utils.VibrateUtil; public class PassportActivity extends BaseFragment implements NotificationCenter.NotificationCenterDelegate { @@ -4164,7 +4163,7 @@ public class PassportActivity extends BaseFragment implements NotificationCenter return false; } if (event.getAction() == MotionEvent.ACTION_UP) { - Calendar calendar = JalaliCalendar.mInstance(); + Calendar calendar = Calendar.getInstance(); int year = calendar.get(Calendar.YEAR); int monthOfYear = calendar.get(Calendar.MONTH); int dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/JalaliCalendar.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/JalaliCalendar.java deleted file mode 100644 index f7b862107..000000000 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/JalaliCalendar.java +++ /dev/null @@ -1,816 +0,0 @@ -package tw.nekomimi.nekogram; - -import java.util.Calendar; -import java.util.GregorianCalendar; -import java.util.Locale; -import java.util.TimeZone; - -/** - * https://github.com/amirmehdizadeh/JalaliCalendar - */ -public class JalaliCalendar extends Calendar { - - public static Calendar mInstance() { - - return Calendar.getInstance(); - - } - - public static int gregorianDaysInMonth[] = {31, 28, 31, 30, 31, - 30, 31, 31, 30, 31, 30, 31}; - public static int jalaliDaysInMonth[] = {31, 31, 31, 31, 31, 31, - 30, 30, 30, 30, 30, 29}; - - public final static int FARVARDIN = 0; - public final static int ORDIBEHESHT = 1; - public final static int KHORDAD = 2; - public final static int TIR = 3; - public final static int MORDAD = 4; - public final static int SHAHRIVAR = 5; - public final static int MEHR = 6; - public final static int ABAN = 7; - public final static int AZAR = 8; - public final static int DEY = 9; - public final static int BAHMAN = 10; - public final static int ESFAND = 11; - - private static TimeZone timeZone = TimeZone.getDefault(); - private static boolean isTimeSeted = false; - - private static final int ONE_SECOND = 1000; - private static final int ONE_MINUTE = 60 * ONE_SECOND; - private static final int ONE_HOUR = 60 * ONE_MINUTE; - private static final long ONE_DAY = 24 * ONE_HOUR; - static final int BCE = 0; - static final int CE = 1; - public static final int AD = 1; - private GregorianCalendar cal; - - static final int MIN_VALUES[] = { - BCE, // ERA - 1, // YEAR - FARVARDIN, // MONTH - 1, // WEEK_OF_YEAR - 0, // WEEK_OF_MONTH - 1, // DAY_OF_MONTH - 1, // DAY_OF_YEAR - SATURDAY, // DAY_OF_WEEK - 1, // DAY_OF_WEEK_IN_MONTH - AM, // AM_PM - 0, // HOUR - 0, // HOUR_OF_DAY - 0, // MINUTE - 0, // SECOND - 0, // MILLISECOND - -13 * ONE_HOUR, // ZONE_OFFSET (UNIX compatibility) - 0 // DST_OFFSET - }; - - static final int LEAST_MAX_VALUES[] = { - CE, // ERA - 292269054, // YEAR - ESFAND, // MONTH - 52, // WEEK_OF_YEAR - 4, // WEEK_OF_MONTH - 28, // DAY_OF_MONTH - 365, // DAY_OF_YEAR - FRIDAY, // DAY_OF_WEEK - 4, // DAY_OF_WEEK_IN - PM, // AM_PM - 11, // HOUR - 23, // HOUR_OF_DAY - 59, // MINUTE - 59, // SECOND - 999, // MILLISECOND - 14 * ONE_HOUR, // ZONE_OFFSET - 20 * ONE_MINUTE // DST_OFFSET (historical least maximum) - }; - - static final int MAX_VALUES[] = { - CE, // ERA - 292278994, // YEAR - ESFAND, // MONTH - 53, // WEEK_OF_YEAR - 6, // WEEK_OF_MONTH - 31, // DAY_OF_MONTH - 366, // DAY_OF_YEAR - FRIDAY, // DAY_OF_WEEK - 6, // DAY_OF_WEEK_IN - PM, // AM_PM - 11, // HOUR - 23, // HOUR_OF_DAY - 59, // MINUTE - 59, // SECOND - 999, // MILLISECOND - 14 * ONE_HOUR, // ZONE_OFFSET - 2 * ONE_HOUR // DST_OFFSET (double summer time) - }; - - public JalaliCalendar() { - this(TimeZone.getDefault(), Locale.getDefault()); - } - - public JalaliCalendar(TimeZone zone) { - this(zone, Locale.getDefault()); - } - - public JalaliCalendar(Locale aLocale) { - this(TimeZone.getDefault(), aLocale); - } - - public JalaliCalendar(TimeZone zone, Locale aLocale) { - - super(zone, aLocale); - timeZone = zone; - Calendar calendar = Calendar.getInstance(zone, aLocale); - - YearMonthDate yearMonthDate = new YearMonthDate(calendar.get(YEAR), calendar.get(MONTH), calendar.get(DATE)); - yearMonthDate = gregorianToJalali(yearMonthDate); - set(yearMonthDate.getYear(), yearMonthDate.getMonth(), yearMonthDate.getDate()); - complete(); - - } - - public JalaliCalendar(int year, int month, int dayOfMonth) { - this(year, month, dayOfMonth, 0, 0, 0, 0); - } - - public JalaliCalendar(int year, int month, int dayOfMonth, int hourOfDay, - int minute) { - this(year, month, dayOfMonth, hourOfDay, minute, 0, 0); - } - - public JalaliCalendar(int year, int month, int dayOfMonth, int hourOfDay, - int minute, int second) { - this(year, month, dayOfMonth, hourOfDay, minute, second, 0); - } - - JalaliCalendar(int year, int month, int dayOfMonth, - int hourOfDay, int minute, int second, int millis) { - super(); - - this.set(YEAR, year); - this.set(MONTH, month); - this.set(DAY_OF_MONTH, dayOfMonth); - - if (hourOfDay >= 12 && hourOfDay <= 23) { - - this.set(AM_PM, PM); - this.set(HOUR, hourOfDay - 12); - } else { - this.set(HOUR, hourOfDay); - this.set(AM_PM, AM); - } - - this.set(HOUR_OF_DAY, hourOfDay); - this.set(MINUTE, minute); - this.set(SECOND, second); - - this.set(MILLISECOND, millis); - - YearMonthDate yearMonthDate = jalaliToGregorian(new YearMonthDate(fields[1], fields[2], fields[5])); - cal = new GregorianCalendar(yearMonthDate.getYear(), yearMonthDate.getMonth(), yearMonthDate.getDate(), hourOfDay, - minute, second); - time = cal.getTimeInMillis(); - - isTimeSeted = true; - } - - - public static YearMonthDate gregorianToJalali(YearMonthDate gregorian) { - - if (gregorian.getMonth() > 11 || gregorian.getMonth() < -11) { - throw new IllegalArgumentException(); - } - int jalaliYear; - int jalaliMonth; - int jalaliDay; - - int gregorianDayNo, jalaliDayNo; - int jalaliNP; - int i; - - gregorian.setYear(gregorian.getYear() - 1600); - gregorian.setDate(gregorian.getDate() - 1); - - gregorianDayNo = 365 * gregorian.getYear() + (int) Math.floor((gregorian.getYear() + 3) / 4) - - (int) Math.floor((gregorian.getYear() + 99) / 100) - + (int) Math.floor((gregorian.getYear() + 399) / 400); - for (i = 0; i < gregorian.getMonth(); ++i) { - gregorianDayNo += gregorianDaysInMonth[i]; - } - - if (gregorian.getMonth() > 1 && ((gregorian.getYear() % 4 == 0 && gregorian.getYear() % 100 != 0) - || (gregorian.getYear() % 400 == 0))) { - ++gregorianDayNo; - } - - gregorianDayNo += gregorian.getDate(); - - jalaliDayNo = gregorianDayNo - 79; - - jalaliNP = (int) Math.floor(jalaliDayNo / 12053); - jalaliDayNo = jalaliDayNo % 12053; - - jalaliYear = 979 + 33 * jalaliNP + 4 * (int) (jalaliDayNo / 1461); - jalaliDayNo = jalaliDayNo % 1461; - - if (jalaliDayNo >= 366) { - jalaliYear += (int) Math.floor((jalaliDayNo - 1) / 365); - jalaliDayNo = (jalaliDayNo - 1) % 365; - } - - for (i = 0; i < 11 && jalaliDayNo >= jalaliDaysInMonth[i]; ++i) { - jalaliDayNo -= jalaliDaysInMonth[i]; - } - jalaliMonth = i; - jalaliDay = jalaliDayNo + 1; - - return new YearMonthDate(jalaliYear, jalaliMonth, jalaliDay); - } - - - public static YearMonthDate jalaliToGregorian(YearMonthDate jalali) { - if (jalali.getMonth() > 11 || jalali.getMonth() < -11) { - throw new IllegalArgumentException(); - } - - int gregorianYear; - int gregorianMonth; - int gregorianDay; - - int gregorianDayNo, jalaliDayNo; - int leap; - - int i; - jalali.setYear(jalali.getYear() - 979); - jalali.setDate(jalali.getDate() - 1); - - jalaliDayNo = 365 * jalali.getYear() + (int) (jalali.getYear() / 33) * 8 - + (int) Math.floor(((jalali.getYear() % 33) + 3) / 4); - for (i = 0; i < jalali.getMonth(); ++i) { - jalaliDayNo += jalaliDaysInMonth[i]; - } - - jalaliDayNo += jalali.getDate(); - - gregorianDayNo = jalaliDayNo + 79; - - gregorianYear = 1600 + 400 * (int) Math.floor(gregorianDayNo / 146097); /* 146097 = 365*400 + 400/4 - 400/100 + 400/400 */ - gregorianDayNo = gregorianDayNo % 146097; - - leap = 1; - if (gregorianDayNo >= 36525) /* 36525 = 365*100 + 100/4 */ { - gregorianDayNo--; - gregorianYear += 100 * (int) Math.floor(gregorianDayNo / 36524); /* 36524 = 365*100 + 100/4 - 100/100 */ - gregorianDayNo = gregorianDayNo % 36524; - - if (gregorianDayNo >= 365) { - gregorianDayNo++; - } else { - leap = 0; - } - } - - gregorianYear += 4 * (int) Math.floor(gregorianDayNo / 1461); /* 1461 = 365*4 + 4/4 */ - gregorianDayNo = gregorianDayNo % 1461; - - if (gregorianDayNo >= 366) { - leap = 0; - - gregorianDayNo--; - gregorianYear += (int) Math.floor(gregorianDayNo / 365); - gregorianDayNo = gregorianDayNo % 365; - } - - for (i = 0; gregorianDayNo >= gregorianDaysInMonth[i] + ((i == 1 && leap == 1) ? i : 0); i++) { - gregorianDayNo -= gregorianDaysInMonth[i] + ((i == 1 && leap == 1) ? i : 0); - } - gregorianMonth = i; - gregorianDay = gregorianDayNo + 1; - - return new YearMonthDate(gregorianYear, gregorianMonth, gregorianDay); - - } - - public static int weekOfYear(int dayOfYear, int year) { - switch (dayOfWeek(JalaliCalendar.jalaliToGregorian(new YearMonthDate(year, 0, 1)))) { - case 2: - dayOfYear++; - break; - case 3: - dayOfYear += 2; - break; - case 4: - dayOfYear += 3; - break; - case 5: - dayOfYear += 4; - break; - case 6: - dayOfYear += 5; - break; - case 7: - dayOfYear--; - break; - } - ; - dayOfYear = (int) Math.floor(dayOfYear / 7); - return dayOfYear + 1; - } - - public static int dayOfWeek(YearMonthDate yearMonthDate) { - - Calendar cal = new GregorianCalendar(yearMonthDate.getYear(), yearMonthDate.getMonth(), yearMonthDate.getDate()); - return cal.get(DAY_OF_WEEK); - - } - - public static boolean isLeepYear(int year) { - //Algorithm from www.wikipedia.com - if ((year % 33 == 1 || year % 33 == 5 || year % 33 == 9 || year % 33 == 13 || - year % 33 == 17 || year % 33 == 22 || year % 33 == 26 || year % 33 == 30)) { - return true; - } else return false; - } - - @Override - protected void computeTime() { - - if (!isTimeSet && !isTimeSeted) { - Calendar cal = GregorianCalendar.getInstance(timeZone); - if (!isSet(HOUR_OF_DAY)) { - super.set(HOUR_OF_DAY, cal.get(HOUR_OF_DAY)); - } - if (!isSet(HOUR)) { - super.set(HOUR, cal.get(HOUR)); - } - if (!isSet(MINUTE)) { - super.set(MINUTE, cal.get(MINUTE)); - } - if (!isSet(SECOND)) { - super.set(SECOND, cal.get(SECOND)); - } - if (!isSet(MILLISECOND)) { - super.set(MILLISECOND, cal.get(MILLISECOND)); - } - if (!isSet(ZONE_OFFSET)) { - super.set(ZONE_OFFSET, cal.get(ZONE_OFFSET)); - } - if (!isSet(DST_OFFSET)) { - super.set(DST_OFFSET, cal.get(DST_OFFSET)); - } - if (!isSet(AM_PM)) { - super.set(AM_PM, cal.get(AM_PM)); - } - - if (internalGet(HOUR_OF_DAY) >= 12 && internalGet(HOUR_OF_DAY) <= 23) { - super.set(AM_PM, PM); - super.set(HOUR, internalGet(HOUR_OF_DAY) - 12); - } else { - super.set(HOUR, internalGet(HOUR_OF_DAY)); - super.set(AM_PM, AM); - } - - YearMonthDate yearMonthDate = jalaliToGregorian(new YearMonthDate(internalGet(YEAR), internalGet(MONTH), internalGet(DAY_OF_MONTH))); - cal.set(yearMonthDate.getYear(), yearMonthDate.getMonth(), yearMonthDate.getDate() - , internalGet(HOUR_OF_DAY), internalGet(MINUTE), internalGet(SECOND)); - time = cal.getTimeInMillis(); - - } else if (!isTimeSet && isTimeSeted) { - if (internalGet(HOUR_OF_DAY) >= 12 && internalGet(HOUR_OF_DAY) <= 23) { - super.set(AM_PM, PM); - super.set(HOUR, internalGet(HOUR_OF_DAY) - 12); - } else { - super.set(HOUR, internalGet(HOUR_OF_DAY)); - super.set(AM_PM, AM); - } - cal = new GregorianCalendar(); - super.set(ZONE_OFFSET, timeZone.getRawOffset()); - super.set(DST_OFFSET, timeZone.getDSTSavings()); - YearMonthDate yearMonthDate = jalaliToGregorian(new YearMonthDate(internalGet(YEAR), internalGet(MONTH), internalGet(DAY_OF_MONTH))); - cal.set(yearMonthDate.getYear(), yearMonthDate.getMonth(), yearMonthDate.getDate(), internalGet(HOUR_OF_DAY), - internalGet(MINUTE), internalGet(SECOND)); - time = cal.getTimeInMillis(); - } - } - - public void set(int field, int value) { - switch (field) { - case DATE: { - super.set(field, 0); - add(field, value); - break; - } - case MONTH: { - if (value > 11) { - super.set(field, 11); - add(field, value - 11); - } else if (value < 0) { - super.set(field, 0); - add(field, value); - } else { - super.set(field, value); - } - break; - } - case DAY_OF_YEAR: { - if (isSet(YEAR) && isSet(MONTH) && isSet(DAY_OF_MONTH)) { - super.set(YEAR, internalGet(YEAR)); - super.set(MONTH, 0); - super.set(DATE, 0); - add(field, value); - } else { - super.set(field, value); - } - break; - } - case WEEK_OF_YEAR: { - if (isSet(YEAR) && isSet(MONTH) && isSet(DAY_OF_MONTH)) { - add(field, value - get(WEEK_OF_YEAR)); - } else { - super.set(field, value); - } - break; - } - case WEEK_OF_MONTH: { - if (isSet(YEAR) && isSet(MONTH) && isSet(DAY_OF_MONTH)) { - add(field, value - get(WEEK_OF_MONTH)); - } else { - super.set(field, value); - } - break; - } - case DAY_OF_WEEK: { - if (isSet(YEAR) && isSet(MONTH) && isSet(DAY_OF_MONTH)) { - add(DAY_OF_WEEK, value % 7 - get(DAY_OF_WEEK)); - } else { - super.set(field, value); - } - break; - } - case HOUR_OF_DAY: - case HOUR: - case MINUTE: - case SECOND: - case MILLISECOND: - case ZONE_OFFSET: - case DST_OFFSET: { - if (isSet(YEAR) && isSet(MONTH) && isSet(DATE) && isSet(HOUR) && isSet(HOUR_OF_DAY) && - isSet(MINUTE) && isSet(SECOND) && isSet(MILLISECOND)) { - cal = new GregorianCalendar(); - YearMonthDate yearMonthDate = jalaliToGregorian(new YearMonthDate(internalGet(YEAR), internalGet(MONTH), internalGet(DATE))); - cal.set(yearMonthDate.getYear(), yearMonthDate.getMonth(), yearMonthDate.getDate(), internalGet(HOUR_OF_DAY), internalGet(MINUTE), - internalGet(SECOND)); - cal.set(field, value); - yearMonthDate = gregorianToJalali(new YearMonthDate(cal.get(YEAR), cal.get(MONTH), cal.get(DATE))); - super.set(YEAR, yearMonthDate.getYear()); - super.set(MONTH, yearMonthDate.getMonth()); - super.set(DATE, yearMonthDate.getDate()); - super.set(HOUR_OF_DAY, cal.get(HOUR_OF_DAY)); - super.set(MINUTE, cal.get(MINUTE)); - super.set(SECOND, cal.get(SECOND)); - - } else { - super.set(field, value); - } - break; - } - - - default: { - super.set(field, value); - } - } - } - - @Override - protected void computeFields() { - boolean temp = isTimeSet; - if (!areFieldsSet) { - setMinimalDaysInFirstWeek(1); - setFirstDayOfWeek(7); - - //Day_Of_Year - int dayOfYear = 0; - int index = 0; - - while (index < fields[2]) { - dayOfYear += jalaliDaysInMonth[index++]; - } - dayOfYear += fields[5]; - super.set(DAY_OF_YEAR, dayOfYear); - //*** - - //Day_of_Week - super.set(DAY_OF_WEEK, dayOfWeek(jalaliToGregorian(new YearMonthDate(fields[1], fields[2], fields[5])))); - //*** - - //Day_Of_Week_In_Month - if (0 < fields[5] && fields[5] < 8) { - super.set(DAY_OF_WEEK_IN_MONTH, 1); - } - - if (7 < fields[5] && fields[5] < 15) { - super.set(DAY_OF_WEEK_IN_MONTH, 2); - } - - if (14 < fields[5] && fields[5] < 22) { - super.set(DAY_OF_WEEK_IN_MONTH, 3); - } - - if (21 < fields[5] && fields[5] < 29) { - super.set(DAY_OF_WEEK_IN_MONTH, 4); - } - - if (28 < fields[5] && fields[5] < 32) { - super.set(DAY_OF_WEEK_IN_MONTH, 5); - } - //*** - - //Week_Of_Year - super.set(WEEK_OF_YEAR, weekOfYear(fields[6], fields[1])); - //*** - - //Week_Of_Month - super.set(WEEK_OF_MONTH, weekOfYear(fields[6], fields[1]) - weekOfYear(fields[6] - fields[5], fields[1]) + 1); - // - - isTimeSet = temp; - } - } - - @Override - public void add(int field, int amount) { - - if (field == MONTH) { - amount += get(MONTH); - add(YEAR, amount / 12); - super.set(MONTH, amount % 12); - if (get(DAY_OF_MONTH) > jalaliDaysInMonth[amount % 12]) { - super.set(DAY_OF_MONTH, jalaliDaysInMonth[amount % 12]); - if (get(MONTH) == 11 && isLeepYear(get(YEAR))) { - super.set(DAY_OF_MONTH, 30); - } - } - complete(); - - } else if (field == YEAR) { - - super.set(YEAR, get(YEAR) + amount); - if (get(DAY_OF_MONTH) == 30 && get(MONTH) == 11 && !isLeepYear(get(YEAR))) { - super.set(DAY_OF_MONTH, 29); - } - - complete(); - } else { - YearMonthDate yearMonthDate = jalaliToGregorian(new YearMonthDate(get(YEAR), get(MONTH), get(DATE))); - Calendar gc = new GregorianCalendar(yearMonthDate.getYear(), yearMonthDate.getMonth(), yearMonthDate.getDate(), - get(HOUR_OF_DAY), get(MINUTE), get(SECOND)); - gc.add(field, amount); - yearMonthDate = gregorianToJalali(new YearMonthDate(gc.get(YEAR), gc.get(MONTH), gc.get(DATE))); - super.set(YEAR, yearMonthDate.getYear()); - super.set(MONTH, yearMonthDate.getMonth()); - super.set(DATE, yearMonthDate.getDate()); - super.set(HOUR_OF_DAY, gc.get(HOUR_OF_DAY)); - super.set(MINUTE, gc.get(MINUTE)); - super.set(SECOND, gc.get(SECOND)); - complete(); - } - - } - - @Override - public void roll(int field, boolean up) { - roll(field, up ? +1 : -1); - } - - @Override - public void roll(int field, int amount) { - if (amount == 0) { - return; - } - - if (field < 0 || field >= ZONE_OFFSET) { - throw new IllegalArgumentException(); - } - - complete(); - - switch (field) { - case AM_PM: { - if (amount % 2 != 0) { - if (internalGet(AM_PM) == AM) { - fields[AM_PM] = PM; - } else { - fields[AM_PM] = AM; - } - if (get(AM_PM) == AM) { - super.set(HOUR_OF_DAY, get(HOUR)); - } else { - super.set(HOUR_OF_DAY, get(HOUR) + 12); - } - } - break; - } - case YEAR: { - super.set(YEAR, internalGet(YEAR) + amount); - if (internalGet(MONTH) == 11 && internalGet(DAY_OF_MONTH) == 30 && !isLeepYear(internalGet(YEAR))) { - super.set(DAY_OF_MONTH, 29); - } - break; - } - case MINUTE: { - int unit = 60; - int m = (internalGet(MINUTE) + amount) % unit; - if (m < 0) { - m += unit; - } - super.set(MINUTE, m); - break; - } - case SECOND: { - int unit = 60; - int s = (internalGet(SECOND) + amount) % unit; - if (s < 0) { - s += unit; - } - super.set(SECOND, s); - break; - } - case MILLISECOND: { - int unit = 1000; - int ms = (internalGet(MILLISECOND) + amount) % unit; - if (ms < 0) { - ms += unit; - } - super.set(MILLISECOND, ms); - break; - } - - case HOUR: { - super.set(HOUR, (internalGet(HOUR) + amount) % 12); - if (internalGet(HOUR) < 0) { - fields[HOUR] += 12; - } - if (internalGet(AM_PM) == AM) { - super.set(HOUR_OF_DAY, internalGet(HOUR)); - } else { - super.set(HOUR_OF_DAY, internalGet(HOUR) + 12); - } - - break; - } - case HOUR_OF_DAY: { - fields[HOUR_OF_DAY] = (internalGet(HOUR_OF_DAY) + amount) % 24; - if (internalGet(HOUR_OF_DAY) < 0) { - fields[HOUR_OF_DAY] += 24; - } - if (internalGet(HOUR_OF_DAY) < 12) { - fields[AM_PM] = AM; - fields[HOUR] = internalGet(HOUR_OF_DAY); - } else { - fields[AM_PM] = PM; - fields[HOUR] = internalGet(HOUR_OF_DAY) - 12; - } - - } - case MONTH: { - int mon = (internalGet(MONTH) + amount) % 12; - if (mon < 0) { - mon += 12; - } - super.set(MONTH, mon); - - int monthLen = jalaliDaysInMonth[mon]; - if (internalGet(MONTH) == 11 && isLeepYear(internalGet(YEAR))) { - monthLen = 30; - } - if (internalGet(DAY_OF_MONTH) > monthLen) { - super.set(DAY_OF_MONTH, monthLen); - } - break; - } - case DAY_OF_MONTH: { - int unit = 0; - if (0 <= get(MONTH) && get(MONTH) <= 5) { - unit = 31; - } - if (6 <= get(MONTH) && get(MONTH) <= 10) { - unit = 30; - } - if (get(MONTH) == 11) { - if (isLeepYear(get(YEAR))) { - unit = 30; - } else { - unit = 29; - } - } - int d = (get(DAY_OF_MONTH) + amount) % unit; - if (d < 0) { - d += unit; - } - super.set(DAY_OF_MONTH, d); - break; - - } - case WEEK_OF_YEAR: { - break; - } - case DAY_OF_YEAR: { - int unit = (isLeepYear(internalGet(YEAR)) ? 366 : 365); - int dayOfYear = (internalGet(DAY_OF_YEAR) + amount) % unit; - dayOfYear = (dayOfYear > 0) ? dayOfYear : dayOfYear + unit; - int month = 0, temp = 0; - while (dayOfYear > temp) { - temp += jalaliDaysInMonth[month++]; - } - super.set(MONTH, --month); - super.set(DAY_OF_MONTH, jalaliDaysInMonth[internalGet(MONTH)] - (temp - dayOfYear)); - break; - } - case DAY_OF_WEEK: { - int index = amount % 7; - if (index < 0) { - index += 7; - } - int i = 0; - while (i != index) { - if (internalGet(DAY_OF_WEEK) == FRIDAY) { - add(DAY_OF_MONTH, -6); - } else { - add(DAY_OF_MONTH, +1); - } - i++; - } - break; - } - - default: - throw new IllegalArgumentException(); - } - - } - - @Override - public int getMinimum(int field) { - return MIN_VALUES[field]; - } - - @Override - public int getMaximum(int field) { - return MAX_VALUES[field]; - } - - @Override - public int getGreatestMinimum(int field) { - return MIN_VALUES[field]; - } - - @Override - public int getLeastMaximum(int field) { - return LEAST_MAX_VALUES[field]; - } - - public static class YearMonthDate { - - public YearMonthDate(int year, int month, int date) { - this.year = year; - this.month = month; - this.date = date; - } - - private int year; - private int month; - private int date; - - public int getYear() { - return year; - } - - public void setYear(int year) { - this.year = year; - } - - public int getMonth() { - return month; - } - - public void setMonth(int month) { - this.month = month; - } - - public int getDate() { - return date; - } - - public void setDate(int date) { - this.date = date; - } - - public String toString() { - return getYear() + "/" + getMonth() + "/" + getDate(); - } - } -} - diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java index 69c8ba294..8c4c15cc6 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java @@ -4,11 +4,9 @@ import android.app.Activity; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; -import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import org.telegram.messenger.ApplicationLoader; -import org.telegram.messenger.BuildVars; import org.telegram.messenger.LocaleController; import org.telegram.messenger.NotificationCenter; import org.telegram.messenger.NotificationsService; @@ -110,7 +108,6 @@ public class NekoConfig { public static boolean mediaPreview; public static boolean proxyAutoSwitch; - public static boolean usePersianCalender; public static String openPGPApp; public static long openPGPKeyId; @@ -247,7 +244,7 @@ public class NekoConfig { mediaPreview = preferences.getBoolean("mediaPreview", false); proxyAutoSwitch = preferences.getBoolean("proxy_auto_switch", false); - usePersianCalender = false;//preferences.getBoolean("usePersianCalender", false); + //preferences.getBoolean("usePersianCalender", false); openPGPApp = preferences.getString("openPGPApp",""); openPGPKeyId = preferences.getLong("openPGPKeyId",0L); @@ -754,12 +751,6 @@ public class NekoConfig { } - public static void toggleUsePersianCalender() { - - preferences.edit().putBoolean("usePersianCalender",usePersianCalender = !usePersianCalender).apply(); - - } - public static void setOpenPGPApp(String packageName) { preferences.edit().putString("openPGPApp",openPGPApp = packageName).apply(); diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java index e85af75a6..4efdf8d52 100644 --- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java +++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/settings/NekoGeneralSettingsActivity.java @@ -486,10 +486,10 @@ public class NekoGeneralSettingsActivity extends BaseFragment { ActionBarLayout.headerShadowDrawable = NekoConfig.disableAppBarShadow ? null : parentLayout.getResources().getDrawable(R.drawable.header_shadow).mutate(); parentLayout.rebuildAllFragmentViews(true, true); } else if (position == usePersianCalenderRow) { - NekoConfig.toggleUsePersianCalender(); + /* NekoConfig.toggleUsePersianCalender(); if (view instanceof TextCheckCell) { ((TextCheckCell) view).setChecked(NekoConfig.usePersianCalender); - } + }*/ } else if (position == pgpAppRow) { PopupBuilder builder = new PopupBuilder(view); @@ -967,7 +967,7 @@ public class NekoGeneralSettingsActivity extends BaseFragment { } else if (position == appBarShadowRow) { textCell.setTextAndCheck(LocaleController.getString("DisableAppBarShadow", R.string.DisableAppBarShadow), NekoConfig.disableAppBarShadow, eventTypeRow != -1); } else if (position == usePersianCalenderRow) { - textCell.setTextAndCheck(LocaleController.getString("UsePersianCalender", R.string.UsePersianCalender), NekoConfig.usePersianCalender, false); + textCell.setTextAndCheck(LocaleController.getString("UsePersianCalender", R.string.UsePersianCalender), false, false); } else if (position == autoPauseVideoRow) { textCell.setTextAndValueAndCheck(LocaleController.getString("AutoPauseVideo", R.string.AutoPauseVideo), LocaleController.getString("AutoPauseVideoAbout", R.string.AutoPauseVideoAbout), NekoConfig.autoPauseVideo, true, true); } diff --git a/gradle.properties b/gradle.properties index 0d44c3f00..f0179a83a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,4 @@ org.gradle.parallel=true org.gradle.configureondemand=false android.useAndroidX=true android.enableJetifier=true -android.bundle.enableUncompressedNativeLibs=false +android.bundle.enableUncompressedNativeLibs=false \ No newline at end of file