summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh/antennapod/activity
diff options
context:
space:
mode:
authorByteHamster <info@bytehamster.com>2020-03-25 22:17:29 +0100
committerByteHamster <info@bytehamster.com>2020-03-25 22:17:29 +0100
commit3399be1290592eff1b6ad5dd1a9b7807f7e7fcaa (patch)
tree4f0567eef907cd7c91ffcf041393e59ce6d7f813 /app/src/main/java/de/danoeh/antennapod/activity
parentae906de06d1720331be1c64607cdb6011fc66ef5 (diff)
downloadAntennaPod-3399be1290592eff1b6ad5dd1a9b7807f7e7fcaa.zip
Cleaned up some Lint warnings
Diffstat (limited to 'app/src/main/java/de/danoeh/antennapod/activity')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java1
-rw-r--r--app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java15
2 files changed, 9 insertions, 7 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java
index 03e6b89db..f4d312a4f 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java
@@ -57,6 +57,7 @@ public class OpmlImportActivity extends AppCompatActivity {
*/
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
Log.d(TAG, "Received result");
if (resultCode == RESULT_CANCELED) {
Log.d(TAG, "Activity was cancelled");
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
index 8527949b0..d1cd50608 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/StorageErrorActivity.java
@@ -121,8 +121,9 @@ public class StorageErrorActivity extends AppCompatActivity {
}
public void onActivityResult(int requestCode, int resultCode, Intent data) {
- if (resultCode == Activity.RESULT_OK &&
- requestCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (resultCode == Activity.RESULT_OK
+ && requestCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) {
String dir = data.getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR);
File path;
@@ -131,19 +132,19 @@ public class StorageErrorActivity extends AppCompatActivity {
} else {
path = getExternalFilesDir(null);
}
- if(path == null) {
+ if (path == null) {
return;
}
String message = null;
- if(!path.exists()) {
+ if (!path.exists()) {
message = String.format(getString(R.string.folder_does_not_exist_error), dir);
- } else if(!path.canRead()) {
+ } else if (!path.canRead()) {
message = String.format(getString(R.string.folder_not_readable_error), dir);
- } else if(!path.canWrite()) {
+ } else if (!path.canWrite()) {
message = String.format(getString(R.string.folder_not_writable_error), dir);
}
- if(message == null) {
+ if (message == null) {
Log.d(TAG, "Setting data folder: " + dir);
UserPreferences.setDataFolder(dir);
leaveErrorState();