diff options
Diffstat (limited to 'app/src/main/java/com')
| -rw-r--r-- | app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java | 8 | ||||
| -rw-r--r-- | app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java | 51 |
2 files changed, 28 insertions, 31 deletions
diff --git a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java index 4613257b..d4dd3726 100644 --- a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java +++ b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java @@ -18,18 +18,18 @@ import com.wireguard.android.widget.ToggleSwitch.OnBeforeCheckedChangeListener; * Static methods for use by generated code in the Android data binding library. */ -@SuppressWarnings({"unused"}) +@SuppressWarnings("unused") public final class BindingAdapters { private BindingAdapters() { // Prevent instantiation. } - @BindingAdapter({"checked"}) + @BindingAdapter("checked") public static void setChecked(final ToggleSwitch view, final boolean checked) { view.setCheckedInternal(checked); } - @BindingAdapter({"filter"}) + @BindingAdapter("filter") public static void setFilter(final TextView view, final InputFilter filter) { view.setFilters(new InputFilter[]{filter}); } @@ -85,7 +85,7 @@ public final class BindingAdapters { adapter.setList(newList); } - @BindingAdapter({"onBeforeCheckedChanged"}) + @BindingAdapter("onBeforeCheckedChanged") public static void setOnBeforeCheckedChanged(final ToggleSwitch view, final OnBeforeCheckedChangeListener listener) { view.setOnBeforeCheckedChangeListener(listener); diff --git a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java index b8e89985..53c19b3c 100644 --- a/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java +++ b/app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java @@ -70,30 +70,28 @@ public class ZipExporterPreference extends Preference { return; } CompletableFuture.allOf(futureConfigs.toArray(new CompletableFuture[futureConfigs.size()])) - .whenComplete((ignored1, exception) -> { - asyncWorker.supplyAsync(() -> { - if (exception != null) - throw exception; - final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); - final File file = new File(path, "wireguard-export.zip"); - if (!path.isDirectory() && !path.mkdirs()) - throw new IOException("Cannot create output directory"); - try (ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(file))) { - for (int i = 0; i < futureConfigs.size(); ++i) { - zip.putNextEntry(new ZipEntry(tunnels.get(i).getName() + ".conf")); - zip.write(futureConfigs.get(i).getNow(null). - toString().getBytes(StandardCharsets.UTF_8)); - } - zip.closeEntry(); - zip.close(); - } catch (Exception e) { - // noinspection ResultOfMethodCallIgnored - file.delete(); - throw e; + .whenComplete((ignored1, exception) -> asyncWorker.supplyAsync(() -> { + if (exception != null) + throw exception; + final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS); + final File file = new File(path, "wireguard-export.zip"); + if (!path.isDirectory() && !path.mkdirs()) + throw new IOException("Cannot create output directory"); + try (ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(file))) { + for (int i = 0; i < futureConfigs.size(); ++i) { + zip.putNextEntry(new ZipEntry(tunnels.get(i).getName() + ".conf")); + zip.write(futureConfigs.get(i).getNow(null). + toString().getBytes(StandardCharsets.UTF_8)); } - return file.getAbsolutePath(); - }).whenComplete(this::exportZipComplete); - }); + zip.closeEntry(); + zip.close(); + } catch (Exception e) { + // noinspection ResultOfMethodCallIgnored + file.delete(); + throw e; + } + return file.getAbsolutePath(); + }).whenComplete(this::exportZipComplete)); } private void exportZipComplete(final String filePath, final Throwable throwable) { @@ -113,10 +111,9 @@ public class ZipExporterPreference extends Preference { @Override public CharSequence getSummary() { - if (exportedFilePath == null) - return getContext().getString(R.string.export_summary); - else - return getContext().getString(R.string.export_success, exportedFilePath); + return exportedFilePath == null ? + getContext().getString(R.string.export_summary) : + getContext().getString(R.string.export_success, exportedFilePath); } @Override |