upgrade to Butterknife 7.0.0

main/.factorypath

@@ -1,4 +1,4 @@
 <factorypath>
-    <factorypathentry kind="WKSPJAR" id="/cgeo/libs/butterknife-6.1.0.jar" enabled="true" runInBatchMode="false"/>
+    <factorypathentry kind="WKSPJAR" id="/cgeo/libs/butterknife-7.0.0.jar" enabled="true" runInBatchMode="false"/>
     <factorypathentry kind="WKSPJAR" id="/cgeo/compile-libs/androidannotations-3.3.1.jar" enabled="true" runInBatchMode="false"/>
 </factorypath>

main/build.gradle

@@ -160,7 +160,7 @@ dependencies {
     compile 'com.google.android.gms:play-services:7.3.0'
 
     // Annotations for View injection
-    compile 'com.jakewharton:butterknife:6.1.0'
+    compile 'com.jakewharton:butterknife:7.0.0'
 
     // Apache Commons
     compile "org.apache.commons:commons-collections4:$CommonsCollections4Version"
@@ -269,7 +269,7 @@ dependencies {
     unitTestCompile 'com.google.android:android-test:4.1.1.4'
 
     unitTestCompile 'com.googlecode.androidannotations:androidannotations-api:$AAVersion'
-    unitTestCompile 'com.jakewharton:butterknife:6.1.0'
+    unitTestCompile 'com.jakewharton:butterknife:7.0.0'
     unitTestCompile 'org.apache.commons:commons-collections4:4.0'
     unitTestCompile 'commons-io:commons-io:2.4'
     unitTestCompile 'org.apache.commons:commons-lang3:$CommonsLang3Version'

main/libs/butterknife-7.0.0.jar.properties

@@ -0,0 +1,2 @@
+src=src/butterknife-7.0.0-sources.jar
+doc=src/butterknife-7.0.0-javadoc.jar

main/project/libraries/pom.xml

@@ -18,19 +18,19 @@
 	<properties>
 		<AndroidAnnotationsVersion>3.3.1</AndroidAnnotationsVersion>
 
-		<ButterKnifeVersion>6.1.0</ButterKnifeVersion>
+		<ButterKnifeVersion>7.0.0</ButterKnifeVersion>
 
 		<CommonsCollections4Version>4.0</CommonsCollections4Version>
 		<CommonsIoVersion>2.4</CommonsIoVersion>
 		<CommonsLang3Version>3.4</CommonsLang3Version>
 
 		<FindbugsAnnotationsVersion>3.0.0</FindbugsAnnotationsVersion>
 
-		<JacksonAnnotationsVersion>2.5.4</JacksonAnnotationsVersion>
-		<JacksonCoreVersion>2.5.4</JacksonCoreVersion>
-		<JacksonDatabindVersion>2.5.4</JacksonDatabindVersion>
+		<JacksonAnnotationsVersion>2.6.0-rc3</JacksonAnnotationsVersion>
+		<JacksonCoreVersion>2.6.0-rc3</JacksonCoreVersion>
+		<JacksonDatabindVersion>2.6.0-rc3</JacksonDatabindVersion>
 
-		<RXAndroidVersion>0.24.0</RXAndroidVersion>
+		<RXAndroidVersion>0.25.0</RXAndroidVersion>
 		<RXJavaVersion>1.0.12</RXJavaVersion>
 	</properties>
 

main/src/cgeo/geocaching/AboutActivity.java

@@ -46,7 +46,7 @@ class LicenseViewCreator extends AbstractCachingPageViewCreator<ScrollView> {
         @Override
         public ScrollView getDispatchedView(final ViewGroup parentView) {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_license_page, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
             setClickListener(licenseLink, "http://www.apache.org/licenses/LICENSE-2.0.html");
             licenseText.setText(getRawResourceString(R.raw.license));
             return view;
@@ -77,7 +77,7 @@ class ContributorsViewCreator extends AbstractCachingPageViewCreator<ScrollView>
         @Override
         public ScrollView getDispatchedView(final ViewGroup parentView) {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_contributors_page, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
             contributors.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             return view;
         }
@@ -93,7 +93,7 @@ class ChangeLogViewCreator extends AbstractCachingPageViewCreator<ScrollView> {
         @Override
         public ScrollView getDispatchedView(final ViewGroup parentView) {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_changes_page, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
             changeLogRelease.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
             final String changeLogMasterString = getString(R.string.changelog_master);
             if (StringUtils.isBlank(changeLogMasterString)) {
@@ -121,7 +121,7 @@ class SystemViewCreator extends AbstractCachingPageViewCreator<ScrollView> {
         @Override
         public ScrollView getDispatchedView(final ViewGroup parentView) {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_system_page, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
             final String systemInfo = SystemInformation.getSystemInformation(AboutActivity.this);
             system.setText(systemInfo);
             system.setMovementMethod(AnchorAwareLinkMovementMethod.getInstance());
@@ -149,7 +149,7 @@ class HelpViewCreator extends AbstractCachingPageViewCreator<ScrollView> {
         @Override
         public ScrollView getDispatchedView(final ViewGroup parentView) {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_help_page, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
             setClickListener(support, "mailto:support@cgeo.org?subject=" + Uri.encode("cgeo " + Version.getVersionName(AboutActivity.this)) +
                     "&body=" + Uri.encode(SystemInformation.getSystemInformation(AboutActivity.this)) + "\n");
             setClickListener(website, "http://www.cgeo.org/");
@@ -176,7 +176,7 @@ class VersionViewCreator extends AbstractCachingPageViewCreator<ScrollView> {
         @Override
         public ScrollView getDispatchedView(final ViewGroup parentView) {
             final ScrollView view = (ScrollView) getLayoutInflater().inflate(R.layout.about_version_page, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
             version.setText(Version.getVersionName(AboutActivity.this));
             setClickListener(donateButton, "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=AQBS7UP76CXW2");
             return view;

main/src/cgeo/geocaching/CacheDetailActivity.java

@@ -1405,7 +1405,7 @@ public ScrollView getDispatchedView(final ViewGroup parentView) {
             }
 
             view = (ScrollView) getLayoutInflater().inflate(R.layout.cachedetail_description_page, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
 
             // cache short description
             if (StringUtils.isNotBlank(cache.getShortDescription())) {

main/src/cgeo/geocaching/CompassActivity.java

@@ -71,7 +71,7 @@ public class CompassActivity extends AbstractActionBarActivity {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         onCreate(savedInstanceState, R.layout.compass_activity);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         // get parameters
         final Bundle extras = getIntent().getExtras();
@@ -146,7 +146,7 @@ public void onConfigurationChanged(final Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
 
         setContentView(R.layout.compass_activity);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
         setTarget(dstCoords, description);
 
         forceRefresh();

main/src/cgeo/geocaching/ImageSelectActivity.java

@@ -66,7 +66,7 @@ public class ImageSelectActivity extends AbstractActionBarActivity {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.imageselect_activity);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         scaleChoiceIndex = Settings.getLogImageScale();
         imageCaption = "";

main/src/cgeo/geocaching/LogTrackableActivity.java

@@ -140,7 +140,7 @@ public void onLoaderReset(final Loader<List<LogTypeTrackable>> listLoader) {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.logtrackable_activity);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         // get parameters
         final Bundle extras = getIntent().getExtras();

main/src/cgeo/geocaching/MainActivity.java

@@ -207,7 +207,7 @@ public void onCreate(final Bundle savedInstanceState) {
         getSupportActionBar().setDisplayHomeAsUpEnabled(false);
 
         setContentView(R.layout.main_activity);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         if ((getIntent().getFlags() & Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT) != 0) {
             // If we had been open already, start from the last used activity.

main/src/cgeo/geocaching/NavigateAnyPointActivity.java

@@ -135,7 +135,7 @@ private LayoutInflater getInflater() {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.navigateanypoint_activity);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         createHistoryView();
         init();
@@ -146,7 +146,7 @@ private void createHistoryView() {
         historyListView.addHeaderView(pointControls, null, false);
 
         // inject a second time to also find the dynamically expanded views above
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         if (getHistoryOfSearchedLocations().isEmpty()) {
             historyListView.addFooterView(getEmptyHistoryFooter(), null, false);

main/src/cgeo/geocaching/SearchActivity.java

@@ -108,7 +108,7 @@ public final void onCreate(final Bundle savedInstanceState) {
         // set title in code, as the activity needs a hard coded title due to the intent filters
         setTitle(res.getString(R.string.search));
 
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
         init();
     }
 

main/src/cgeo/geocaching/SelectMapfileActivity.java

@@ -38,7 +38,7 @@ public SelectMapfileActivity() {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         mapFile = Settings.getMapFile();
 

main/src/cgeo/geocaching/StatusFragment.java

@@ -1,17 +1,9 @@
 package cgeo.geocaching;
 
-import butterknife.ButterKnife;
-import butterknife.InjectView;
-
 import cgeo.geocaching.network.StatusUpdater;
 import cgeo.geocaching.network.StatusUpdater.Status;
 import cgeo.geocaching.utils.Log;
 
-import rx.Subscription;
-import rx.android.app.AppObservable;
-import rx.functions.Action1;
-import rx.subscriptions.Subscriptions;
-
 import android.content.Intent;
 import android.content.res.Resources;
 import android.net.Uri;
@@ -24,6 +16,13 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import butterknife.ButterKnife;
+import butterknife.InjectView;
+import rx.Subscription;
+import rx.android.app.AppObservable;
+import rx.functions.Action1;
+import rx.subscriptions.Subscriptions;
+
 public class StatusFragment extends Fragment {
 
     protected @InjectView(R.id.status_icon) ImageView statusIcon;
@@ -35,7 +34,7 @@ public class StatusFragment extends Fragment {
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         final ViewGroup statusGroup = (ViewGroup) inflater.inflate(R.layout.status, container, false);
-        ButterKnife.inject(this, statusGroup);
+        ButterKnife.bind(this, statusGroup);
         statusSubscription = AppObservable.bindFragment(this, StatusUpdater.LATEST_STATUS)
                 .subscribe(new Action1<Status>() {
                     @Override
@@ -91,7 +90,7 @@ public void onClick(final View v) {
     public void onDestroyView() {
         statusSubscription.unsubscribe();
         super.onDestroyView();
-        ButterKnife.reset(this);
+        ButterKnife.unbind(this);
     }
 
 }

main/src/cgeo/geocaching/TrackableActivity.java

@@ -450,7 +450,7 @@ public class DetailsViewCreator extends AbstractCachingPageViewCreator<ScrollVie
         @Override
         public ScrollView getDispatchedView(final ViewGroup parentView) {
             view = (ScrollView) getLayoutInflater().inflate(R.layout.trackable_details_view, parentView, false);
-            ButterKnife.inject(this, view);
+            ButterKnife.bind(this, view);
 
             final CacheDetailsCreator details = new CacheDetailsCreator(TrackableActivity.this, detailsList);
 

main/src/cgeo/geocaching/UsefulAppsActivity.java

@@ -69,7 +69,7 @@ public HelperApp(final int title, final int description, final int icon, @NonNul
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.usefulapps_activity);
 
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         list.setAdapter(new ArrayAdapter<HelperApp>(this, R.layout.usefulapps_item, HELPER_APPS) {
             @Override

main/src/cgeo/geocaching/WaypointPopupFragment.java

@@ -37,7 +37,7 @@ public class WaypointPopupFragment extends AbstractDialogFragment {
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
         final View  v = inflater.inflate(R.layout.waypoint_popup, container, false);
         initCustomActionBar(v);
-        ButterKnife.inject(this,v);
+        ButterKnife.bind(this,v);
 
         return v;
     }

main/src/cgeo/geocaching/activity/AbstractActivity.java

@@ -136,7 +136,7 @@ protected void onCreate(final Bundle savedInstanceState, final int resourceLayou
         setContentView(resourceLayoutID);
 
         // create view variables
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
     }
 
     private void initializeCommonFields() {

main/src/cgeo/geocaching/filter/FilterActivity.java

@@ -47,7 +47,7 @@ public class FilterActivity extends AbstractActionBarActivity {
     @Override
     public void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.filter_activity);
-        ButterKnife.inject(this);
+        ButterKnife.bind(this);
 
         createListAdapter();
     }

main/src/cgeo/geocaching/ui/AbstractViewHolder.java

@@ -12,7 +12,7 @@
 public abstract class AbstractViewHolder {
 
     protected AbstractViewHolder(final View view) {
-        ButterKnife.inject(this, view);
+        ButterKnife.bind(this, view);
         view.setTag(this);
     }