mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-29 05:43:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix #1131: Update min sdk version and remove redundant checks (#2608)

Browse source
This commit is contained in:
Vivek Maskara 2019-03-16 17:51:51 +05:30 • committed by Adam Jones
parent 900bd4ff2f
commit 6cbce9d283
8 changed files with 15 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/fr/free/nrw/commons/utils/DateUtils.java
View file

@ -55,13 +55,6 @@ public class DateUtils {
}
public static String dateInLocaleFormat(Date date){
String formatter;
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN_MR2) {
formatter = new SimpleDateFormat(DateFormat.getBestDateTimePattern(Locale.getDefault(), "dd MMM yyyy"), Locale.getDefault()).format(date);
}
else {
formatter = String.valueOf(new SimpleDateFormat("dd MMM yyyy", Locale.getDefault()));
}
return formatter;
return new SimpleDateFormat(DateFormat.getBestDateTimePattern(Locale.getDefault(), "dd MMM yyyy"), Locale.getDefault()).format(date);
}
}

13
app/src/main/java/fr/free/nrw/commons/utils/DialogUtil.java
View file

@ -30,9 +30,7 @@ public class DialogUtil {
return;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
isActivityDestroyed = activity.isDestroyed();
}
isActivityDestroyed = activity.isDestroyed();
if (activity.isFinishing() || isActivityDestroyed) {
return;
}
@ -55,10 +53,7 @@ public class DialogUtil {
return;
}
boolean isActivityDestroyed = false;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
isActivityDestroyed = activity.isDestroyed();
}
boolean isActivityDestroyed = activity.isDestroyed();
if (activity.isFinishing() || isActivityDestroyed) {
Timber.e("Activity is not running. Could not show dialog. ");
return;
@ -83,9 +78,7 @@ public class DialogUtil {
return;
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
isActivityDestroyed = activity.isDestroyed();
}
isActivityDestroyed = activity.isDestroyed();
if (activity.isFinishing() || isActivityDestroyed) {
return;
}