Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve deprecation warnings

Browse Source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-02-23 20:09:46 +05:30
parent eb5bfa9b5d
commit 0b45151a3d
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java
View File

@ -171,11 +171,10 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
} }
public void onRequestSetExcludedApplications(@SuppressWarnings("unused") final View view) { public void onRequestSetExcludedApplications(@SuppressWarnings("unused") final View view) {
final FragmentManager fragmentManager = getFragmentManager(); if (binding != null) {
if (fragmentManager != null && binding != null) {
final ArrayList<String> excludedApps = new ArrayList<>(binding.getConfig().getInterface().getExcludedApplications()); final ArrayList<String> excludedApps = new ArrayList<>(binding.getConfig().getInterface().getExcludedApplications());
final AppListDialogFragment fragment = AppListDialogFragment.newInstance(excludedApps, this); final AppListDialogFragment fragment = AppListDialogFragment.newInstance(excludedApps, this);
fragment.show(fragmentManager, null); fragment.show(getParentFragmentManager(), null);
} }
} }

6
app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java
View File

@ -79,9 +79,7 @@ public class TunnelListFragment extends BaseFragment {
Config.parse(new ByteArrayInputStream(configText.getBytes(StandardCharsets.UTF_8))); Config.parse(new ByteArrayInputStream(configText.getBytes(StandardCharsets.UTF_8)));
// Config text is valid, now create the tunnel… // Config text is valid, now create the tunnel…
final FragmentManager fragmentManager = getFragmentManager(); ConfigNamingDialogFragment.newInstance(configText).show(getParentFragmentManager(), null);
if (fragmentManager != null)
ConfigNamingDialogFragment.newInstance(configText).show(fragmentManager, null);
} catch (final BadConfigException | IOException e) { } catch (final BadConfigException | IOException e) {
onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(e)); onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(e));
} }
@ -220,7 +218,7 @@ public class TunnelListFragment extends BaseFragment {
binding.createFab.setOnClickListener(v -> { binding.createFab.setOnClickListener(v -> {
final AddTunnelsSheet bottomSheet = new AddTunnelsSheet(); final AddTunnelsSheet bottomSheet = new AddTunnelsSheet();
bottomSheet.setTargetFragment(this, REQUEST_TARGET_FRAGMENT); bottomSheet.setTargetFragment(this, REQUEST_TARGET_FRAGMENT);
bottomSheet.show(requireFragmentManager(), "BOTTOM_SHEET"); bottomSheet.show(getParentFragmentManager(), "BOTTOM_SHEET");
}); });
binding.executePendingBindings(); binding.executePendingBindings();
EdgeToEdge.setUpRoot((ViewGroup) binding.getRoot()); EdgeToEdge.setUpRoot((ViewGroup) binding.getRoot());