update butterknife probably a last time

6 files changed, 51 insertions, 49 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java
index b7325e03..ba84ed9a 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AbstractProviderDetailActivity.java
@@ -11,7 +11,8 @@ import android.widget.TextView;
 
 import java.util.ArrayList;
 
-import butterknife.InjectView;
+
+import butterknife.BindView;
 import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.R;
 
@@ -22,10 +23,10 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct
 
     final public static String TAG = "providerDetailActivity";
 
-    @InjectView(R.id.provider_detail_description)
+    @BindView(R.id.provider_detail_description)
     AppCompatTextView description;
 
-    @InjectView(R.id.provider_detail_options)
+    @BindView(R.id.provider_detail_options)
     ListView options;
 
     @Override
@@ -39,7 +40,6 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct
             return;
         }
 
-
         setProviderHeaderText(provider.getName());
         description.setText(provider.getDescription());
 
@@ -55,7 +55,6 @@ public abstract class AbstractProviderDetailActivity extends ConfigWizardBaseAct
             onAnonymouslySelected();
         }
 
-
         options.setAdapter(new ArrayAdapter<>(
                 this,
                 R.layout.v_single_list_item,
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AddProviderBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AddProviderBaseActivity.java
index 0031f48d..193c1d59 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AddProviderBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/AddProviderBaseActivity.java
@@ -2,14 +2,15 @@ package se.leap.bitmaskclient.providersetup.activities;
 
 import android.content.Intent;
 import android.os.Bundle;
-import com.google.android.material.textfield.TextInputEditText;
-import com.google.android.material.textfield.TextInputLayout;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.View;
 import android.widget.Button;
 
-import butterknife.InjectView;
+import com.google.android.material.textfield.TextInputEditText;
+import com.google.android.material.textfield.TextInputLayout;
+
+import butterknife.BindView;
 import se.leap.bitmaskclient.R;
 
 import static se.leap.bitmaskclient.providersetup.activities.ProviderListBaseActivity.EXTRAS_KEY_INVALID_URL;
@@ -22,16 +23,16 @@ public abstract class AddProviderBaseActivity extends ConfigWizardBaseActivity {
 
     final public static String EXTRAS_KEY_NEW_URL = "NEW_URL";
 
-    @InjectView(R.id.text_uri_error)
+    @BindView(R.id.text_uri_error)
     TextInputLayout urlError;
 
-    @InjectView(R.id.text_uri)
+    @BindView(R.id.text_uri)
     TextInputEditText editUrl;
 
-    @InjectView(R.id.button_cancel)
+    @BindView(R.id.button_cancel)
     Button cancelButton;
 
-    @InjectView(R.id.button_save)
+    @BindView(R.id.button_save)
     Button saveButton;
 
 
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ButterKnifeActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ButterKnifeActivity.java
index 22edd9ee..c695cc46 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ButterKnifeActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ButterKnifeActivity.java
@@ -16,9 +16,10 @@
  */
 package se.leap.bitmaskclient.providersetup.activities;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import butterknife.ButterKnife;
 
 /**
@@ -30,13 +31,13 @@ public abstract class ButterKnifeActivity extends AppCompatActivity {
     @Override
     public void setContentView(View view) {
         super.setContentView(view);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
     }
 
     @Override
     public void setContentView(int layoutResID) {
         super.setContentView(layoutResID);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
     }
 
     @Override
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
index 3712c544..b2f13e07 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ConfigWizardBaseActivity.java
@@ -5,23 +5,24 @@ import android.graphics.PorterDuff;
 import android.graphics.Rect;
 import android.os.Build;
 import android.os.Bundle;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.LinearLayout;
+import android.widget.ProgressBar;
+
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.AppCompatTextView;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Guideline;
 import androidx.core.content.ContextCompat;
-import androidx.appcompat.widget.AppCompatTextView;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver;
-import android.widget.LinearLayout;
-import android.widget.ProgressBar;
 
-import butterknife.InjectView;
+import butterknife.BindView;
 import butterknife.Optional;
-import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.R;
+import se.leap.bitmaskclient.base.models.Provider;
 import se.leap.bitmaskclient.base.views.ProviderHeaderView;
 
 import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
@@ -42,32 +43,32 @@ public abstract class ConfigWizardBaseActivity extends ButterKnifeActivity {
     public static final float GUIDE_LINE_COMPACT_DELTA = 0.1f;
     protected SharedPreferences preferences;
 
-    @InjectView(R.id.header)
+    @BindView(R.id.header)
     ProviderHeaderView providerHeaderView;
 
     //Add provider screen has no loading screen
-    @Optional
-    @InjectView(R.id.loading_screen)
+    @Nullable
+    @BindView(R.id.loading_screen)
     protected LinearLayout loadingScreen;
 
-    @Optional
-    @InjectView(R.id.progressbar)
+    @Nullable
+    @BindView(R.id.progressbar)
     protected ProgressBar progressBar;
 
-    @Optional
-    @InjectView(R.id.progressbar_description)
+    @Nullable
+    @BindView(R.id.progressbar_description)
     protected AppCompatTextView progressbarText;
 
     //Only tablet layouts have guidelines as they are based on a ConstraintLayout
-    @Optional
-    @InjectView(R.id.guideline_top)
+    @Nullable
+    @BindView(R.id.guideline_top)
     protected Guideline guideline_top;
 
-    @Optional
-    @InjectView(R.id.guideline_bottom)
+    @Nullable
+    @BindView(R.id.guideline_bottom)
     protected Guideline guideline_bottom;
 
-    @InjectView(R.id.content)
+    @BindView(R.id.content)
     protected LinearLayout content;
 
     protected Provider provider;
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderCredentialsBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderCredentialsBaseActivity.java
index 91d0de56..e186ce5d 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderCredentialsBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderCredentialsBaseActivity.java
@@ -43,7 +43,7 @@ import android.widget.TextView;
 import org.json.JSONArray;
 import org.json.JSONException;
 
-import butterknife.InjectView;
+import butterknife.BindView;
 import butterknife.OnClick;
 import se.leap.bitmaskclient.base.models.Constants.CREDENTIAL_ERRORS;
 import se.leap.bitmaskclient.base.models.Provider;
@@ -87,28 +87,28 @@ public abstract class ProviderCredentialsBaseActivity extends ConfigWizardBaseAc
     protected Intent mConfigState = new Intent(SHOWING_FORM);
     protected ProviderAPIBroadcastReceiver providerAPIBroadcastReceiver;
 
-    @InjectView(R.id.provider_credentials_user_message)
+    @BindView(R.id.provider_credentials_user_message)
     AppCompatTextView userMessage;
 
-    @InjectView(R.id.provider_credentials_username)
+    @BindView(R.id.provider_credentials_username)
     TextInputEditText usernameField;
 
-    @InjectView(R.id.provider_credentials_password)
+    @BindView(R.id.provider_credentials_password)
     TextInputEditText passwordField;
 
-    @InjectView(R.id.provider_credentials_password_verification)
+    @BindView(R.id.provider_credentials_password_verification)
     TextInputEditText passwordVerificationField;
 
-    @InjectView(R.id.provider_credentials_username_error)
+    @BindView(R.id.provider_credentials_username_error)
     TextInputLayout usernameError;
 
-    @InjectView(R.id.provider_credentials_password_error)
+    @BindView(R.id.provider_credentials_password_error)
     TextInputLayout passwordError;
 
-    @InjectView(R.id.provider_credentials_password_verification_error)
+    @BindView(R.id.provider_credentials_password_verification_error)
     TextInputLayout passwordVerificationError;
 
-    @InjectView(R.id.button)
+    @BindView(R.id.button)
     AppCompatButton button;
 
     private boolean isUsernameError = false;
diff --git a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderListBaseActivity.java
index 46a40d11..002335db 100644
--- a/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderListBaseActivity.java
+++ b/app/src/main/java/se/leap/bitmaskclient/providersetup/activities/ProviderListBaseActivity.java
@@ -30,15 +30,15 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import butterknife.InjectView;
+import butterknife.BindView;
 import butterknife.OnItemClick;
-import se.leap.bitmaskclient.providersetup.AddProviderActivity;
+import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.base.models.Provider;
+import se.leap.bitmaskclient.providersetup.AddProviderActivity;
 import se.leap.bitmaskclient.providersetup.ProviderListActivity;
+import se.leap.bitmaskclient.providersetup.ProviderListAdapter;
 import se.leap.bitmaskclient.providersetup.ProviderRenderer;
 import se.leap.bitmaskclient.providersetup.ProviderRendererBuilder;
-import se.leap.bitmaskclient.R;
-import se.leap.bitmaskclient.providersetup.ProviderListAdapter;
 
 import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_ADD_PROVIDER;
 import static se.leap.bitmaskclient.base.models.Constants.REQUEST_CODE_CONFIGURE_LEAP;
@@ -58,7 +58,7 @@ import static se.leap.bitmaskclient.providersetup.ProviderSetupInterface.Provide
 
 public abstract class ProviderListBaseActivity extends ProviderSetupBaseActivity {
 
-    @InjectView(R.id.provider_list)
+    @BindView(R.id.provider_list)
     protected ListView providerListView;
     @Inject
     protected ProviderListAdapter adapter;