mirror of
https://github.com/syncthing/syncthing-android.git
synced 2024-11-26 14:21:16 +00:00
Fixed lint warnings.
This commit is contained in:
parent
add57da804
commit
293fae2be9
1 changed files with 14 additions and 3 deletions
|
@ -1,5 +1,6 @@
|
||||||
package com.nutomic.syncthingandroid.activities;
|
package com.nutomic.syncthingandroid.activities;
|
||||||
|
|
||||||
|
import android.annotation.SuppressLint;
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.AlertDialog;
|
import android.app.AlertDialog;
|
||||||
import android.content.ComponentName;
|
import android.content.ComponentName;
|
||||||
|
@ -7,6 +8,7 @@ import android.content.Context;
|
||||||
import android.content.DialogInterface;
|
import android.content.DialogInterface;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
|
import android.os.Build;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.os.Environment;
|
import android.os.Environment;
|
||||||
import android.os.IBinder;
|
import android.os.IBinder;
|
||||||
|
@ -49,7 +51,7 @@ public class FolderPickerActivity extends SyncthingActivity
|
||||||
|
|
||||||
private RootsAdapter mRootsAdapter;
|
private RootsAdapter mRootsAdapter;
|
||||||
|
|
||||||
private ArrayList<File> mRootDirectories = new ArrayList();
|
private ArrayList<File> mRootDirectories = new ArrayList<>();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Location of null means that the list of roots is displayed.
|
* Location of null means that the list of roots is displayed.
|
||||||
|
@ -57,6 +59,7 @@ public class FolderPickerActivity extends SyncthingActivity
|
||||||
private File mLocation;
|
private File mLocation;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@SuppressLint("NewApi")
|
||||||
protected void onCreate(Bundle savedInstanceState) {
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
@ -192,10 +195,18 @@ public class FolderPickerActivity extends SyncthingActivity
|
||||||
File f = adapter.getItem(i);
|
File f = adapter.getItem(i);
|
||||||
if (f.isDirectory()) {
|
if (f.isDirectory()) {
|
||||||
displayFolder(f);
|
displayFolder(f);
|
||||||
invalidateOptionsMenu();
|
invalidateOptions();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressLint("NewApi")
|
||||||
|
private void invalidateOptions() {
|
||||||
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB)
|
||||||
|
invalidateOptionsMenu();
|
||||||
|
else
|
||||||
|
supportInvalidateOptionsMenu();
|
||||||
|
}
|
||||||
|
|
||||||
private class FileAdapter extends ArrayAdapter<File> {
|
private class FileAdapter extends ArrayAdapter<File> {
|
||||||
|
|
||||||
public FileAdapter(Context context) {
|
public FileAdapter(Context context) {
|
||||||
|
@ -271,7 +282,7 @@ public class FolderPickerActivity extends SyncthingActivity
|
||||||
mListView.setAdapter(mRootsAdapter);
|
mListView.setAdapter(mRootsAdapter);
|
||||||
mLocation = null;
|
mLocation = null;
|
||||||
}
|
}
|
||||||
invalidateOptionsMenu();
|
invalidateOptions();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue