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

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

2
app/build.gradle
View file

@ -102,7 +102,7 @@ android {
versionName '2.10.1'
setProperty("archivesBaseName", "app-commons-v$versionName-" + getBranchName())
minSdkVersion 15
minSdkVersion 19
targetSdkVersion 28
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true

15
app/src/main/java/fr/free/nrw/commons/contributions/ContributionController.java
View file

@ -4,7 +4,6 @@ import android.Manifest;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import androidx.annotation.NonNull;
import java.util.ArrayList;
@ -67,15 +66,11 @@ public class ContributionController {
* Check for permissions and initiate gallery picker
*/
public void initiateGalleryPick(Activity activity, boolean allowMultipleUploads) {
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.JELLY_BEAN) {
initiateGalleryUpload(activity, allowMultipleUploads);
} else {
PermissionUtils.checkPermissionsAndPerformAction(activity,
Manifest.permission.READ_EXTERNAL_STORAGE,
() -> initiateGalleryUpload(activity, allowMultipleUploads),
R.string.storage_permission_title,
R.string.read_storage_permission_rationale);
}
PermissionUtils.checkPermissionsAndPerformAction(activity,
Manifest.permission.READ_EXTERNAL_STORAGE,
() -> initiateGalleryUpload(activity, allowMultipleUploads),
R.string.storage_permission_title,
R.string.read_storage_permission_rationale);
}
/**

11
app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
View file

@ -353,11 +353,7 @@ public class FilePicker implements Constants {
}
private static boolean isPhoto(Intent data) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
return data == null || (data.getData() == null && data.getClipData() == null);
} else {
return data == null || (data.getData() == null);
}
return data == null || (data.getData() == null && data.getClipData() == null);
}
public static boolean willHandleActivityResult(int requestCode, int resultCode, Intent data) {
@ -430,10 +426,7 @@ public class FilePicker implements Constants {
private static List<UploadableFile> getFilesFromGalleryPictures(Intent data, Activity activity) throws IOException {
List<UploadableFile> files = new ArrayList<>();
ClipData clipData = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
clipData = data.getClipData();
}
ClipData clipData = data.getClipData();
if (clipData == null) {
Uri uri = data.getData();
UploadableFile file = PickedFiles.pickedExistingPicture(activity, uri);

4
app/src/main/java/fr/free/nrw/commons/upload/SpinnerLanguagesAdapter.java
View file

@ -127,9 +127,7 @@ public class SpinnerLanguagesAdapter extends ArrayAdapter {
if (languageCodesList.get(position).isEmpty()) {
tvLanguage.setText(languageNamesList.get(position));
tvLanguage.setTextColor(Color.GRAY);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
tvLanguage.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
}
tvLanguage.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
} else {
tvLanguage.setText(
String.format("%s [%s]", languageNamesList.get(position), languageCodesList.get(position)));

4
app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
View file

@ -567,9 +567,7 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI
}
private void configureCategories() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
categoryFrameLayout.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
}
categoryFrameLayout.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
categoriesAdapter = new UploadCategoriesAdapterFactory(categoriesModel).create(new ArrayList<>());
categoriesList.setLayoutManager(new LinearLayoutManager(this));
categoriesList.setAdapter(categoriesAdapter);

2
app/src/main/java/fr/free/nrw/commons/upload/UploadCategoriesRenderer.java
View file

@ -33,7 +33,7 @@ public class UploadCategoriesRenderer extends Renderer<CategoryItem> {
protected void setUpView(View view) {
ButterKnife.bind(this, view);
Configuration config = getContext().getResources().getConfiguration();
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
if (config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) {
checkedView.setLayoutDirection(View.LAYOUT_DIRECTION_LTR);
}
}

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;
}