diff options
author | cyberta <cyberta@riseup.net> | 2020-12-29 19:24:27 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2020-12-29 19:24:27 -0800 |
commit | f03c21446566546e66c977c72c16fdb87f16ffed (patch) | |
tree | 4e3d7c5561e963504553ee941cc258b6b2b06d14 /app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java | |
parent | fd81f2e14e36adb59d534df257e6ba2262cc362f (diff) | |
parent | 9b690df036cf91f749c0b6159a7035233a73315d (diff) |
Merge branch 'update_android_10' into 'master'
Update android 10
See merge request leap/bitmask_android!118
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java index d901ba68..c269c872 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/AboutFragment.java @@ -3,14 +3,16 @@ package se.leap.bitmaskclient.base.fragments; import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.Fragment; + +import butterknife.BindView; import butterknife.ButterKnife; -import butterknife.InjectView; +import butterknife.Unbinder; import se.leap.bitmaskclient.BuildConfig; import se.leap.bitmaskclient.R; @@ -20,17 +22,18 @@ public class AboutFragment extends Fragment { final public static String TAG = AboutFragment.class.getSimpleName(); final public static int VIEWED = 0; + private Unbinder unbinder; - @InjectView(R.id.version) + @BindView(R.id.version) TextView versionTextView; - @InjectView(R.id.terms_of_service) + @BindView(R.id.terms_of_service) TextView termsOfService; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View view = inflater.inflate(R.layout.f_about, container, false); - ButterKnife.inject(this, view); + unbinder = ButterKnife.bind(this, view); return view; } @@ -56,6 +59,12 @@ public class AboutFragment extends Fragment { } } + @Override + public void onDestroyView() { + super.onDestroyView(); + unbinder.unbind(); + } + private boolean hasTermsOfServiceResource() { return getTermsOfServiceResource() != 0; } |