From 4d2bfe3ef3fe7a23b49e9d8f8e5227f1aa134d74 Mon Sep 17 00:00:00 2001
From: Harsh Shandilya <me@msfjarvis.dev>
Date: Wed, 26 Feb 2020 20:26:49 +0530
Subject: [PATCH] Resolve some lint and build warnings

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
---
 .../wireguard/android/fragment/ConfigNamingDialogFragment.java  | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java b/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java
index e8f0419c..effa0593 100644
--- a/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java
+++ b/app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java
@@ -77,7 +77,7 @@ public class ConfigNamingDialogFragment extends DialogFragment {
 
     @Override
     public Dialog onCreateDialog(final Bundle savedInstanceState) {
-        final Activity activity = Objects.requireNonNull(getActivity());
+        final Activity activity = requireActivity();
 
         imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
 
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index acb93f33..26ca0232 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -139,7 +139,7 @@
     <string name="tools_installer_working">正在安装 wg 与 wg-quick...</string>
     <string name="tools_unavailable_error">所需工具不可用</string>
     <string name="transfer">流量</string>
-    <string name="transfer_rx_tx">接收：%s，发送：%s</string>
+    <string name="transfer_rx_tx">接收：%1$s，发送：%2$s</string>
     <string name="transfer_bytes">%d B</string>
     <string name="transfer_kibibytes">%.2f KiB</string>
     <string name="transfer_mibibytes">%.2f MiB</string>