gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Minor linter fixes

Browse source 
Signed-off-by: Alexander Borsuk <me@alex.bio>
This commit is contained in:
Alexander Borsuk 2022-05-31 00:49:47 +02:00 • committed by Viktor Govako
parent 6b687c30f3
commit 6983e0e06d
3 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/src/com/mapswithme/maps/settings/StoragePathFragment.java
View file

@ -28,7 +28,6 @@ public class StoragePathFragment extends BaseSettingsFragment
implements OnBackPressListener
{
private TextView mHeader;
private ListView mList;
private StoragePathAdapter mAdapter;
private StoragePathManager mPathManager;
@ -47,7 +46,7 @@ public class StoragePathFragment extends BaseSettingsFragment
mAdapter = new StoragePathAdapter(mPathManager, requireActivity());
mHeader = root.findViewById(R.id.header);
mList = root.findViewById(R.id.list);
ListView mList = root.findViewById(R.id.list);
mList.setOnItemClickListener((parent, view, position, id) -> changeStorage(position));
mList.setAdapter(mAdapter);
@ -125,7 +124,7 @@ public class StoragePathFragment extends BaseSettingsFragment
dialog.show();
ThreadPool.getStorage().execute(() -> {
final boolean result = mPathManager.moveStorage(newPath, oldPath);
final boolean result = StoragePathManager.moveStorage(newPath, oldPath);
UiThread.run(() -> {
if (dialog.isShowing())

13
android/src/com/mapswithme/maps/settings/StoragePathManager.java
View file

@ -49,7 +49,7 @@ public class StoragePathManager
private OnStorageListChangedListener mStoragesChangedListener;
private BroadcastReceiver mInternalReceiver;
private Context mContext;
private final Context mContext;
public final List<StorageItem> mStorages = new ArrayList<>();
public int mCurrentStorageIndex = -1;
@ -131,21 +131,20 @@ public class StoragePathManager
return;
}
String path = null;
String path;
try {
path = dir.getCanonicalPath();
} catch (IOException e) {
LOGGER.e(TAG, "IOException at getCanonicalPath " + e);
return;
}
String commentedPath = null;
// Add the trailing separator because the native code assumes that all paths have it.
path = StorageUtils.addTrailingSeparator(path);
final boolean isCurrent = path.equals(configPath);
final long totalSize = dir.getTotalSpace();
final long freeSize = dir.getUsableSpace();
commentedPath = path + (StorageUtils.addTrailingSeparator(dir.getPath()).equals(path)
String commentedPath = path + (StorageUtils.addTrailingSeparator(dir.getPath()).equals(path)
? "" : " (" + dir.getPath() + ")") + " - " +
(isCurrent ? "currently configured, " : "") +
(isInternal ? "internal" : "external") + ", " +
@ -177,7 +176,7 @@ public class StoragePathManager
// Get additional storage information for Android 7+.
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N)
{
final StorageManager sm = (StorageManager) mContext.getSystemService(mContext.STORAGE_SERVICE);
final StorageManager sm = (StorageManager) mContext.getSystemService(Context.STORAGE_SERVICE);
if (sm != null)
{
final StorageVolume sv = sm.getStorageVolume(dir);
@ -291,7 +290,7 @@ public class StoragePathManager
for (StorageItem storage : mStorages)
{
if ((res == null || res.mFreeSize < storage.mFreeSize)
&& storage.mIsReadonly == false && !storage.equals(mInternalStorage))
&& !storage.mIsReadonly && !storage.equals(mInternalStorage))
res = storage;
}
@ -307,7 +306,7 @@ public class StoragePathManager
{
StoragePathManager mgr = new StoragePathManager(application);
mgr.scanAvailableStorages();
String path = null;
String path;
final List<StorageItem> storages = mgr.mStorages;
final int currentIdx = mgr.mCurrentStorageIndex;

2
android/src/com/mapswithme/util/StorageUtils.java
View file

@ -323,8 +323,6 @@ public class StorageUtils
*/
public static void listContentProviderFilesRecursively(ContentResolver contentResolver, Uri rootUri, UriVisitor filter)
{
ArrayList<Uri> result = new ArrayList<>();
Uri rootDir = DocumentsContract.buildChildDocumentsUriUsingTree(rootUri, DocumentsContract.getTreeDocumentId(rootUri));
Queue<Uri> directories = new LinkedBlockingQueue<>();
directories.add(rootDir);