1 files changed, 6 insertions, 6 deletions
diff --git a/main/src/cgeo/geocaching/LogTrackableActivity.java b/main/src/cgeo/geocaching/LogTrackableActivity.java
index a45d584..e549fdc 100644
--- a/main/src/cgeo/geocaching/LogTrackableActivity.java
+++ b/main/src/cgeo/geocaching/LogTrackableActivity.java
@@ -1,7 +1,7 @@
 package cgeo.geocaching;
 
+import butterknife.ButterKnife;
 import butterknife.InjectView;
-import butterknife.Views;
 
 import cgeo.geocaching.connector.gc.GCParser;
 import cgeo.geocaching.connector.gc.Login;
@@ -16,7 +16,7 @@ import cgeo.geocaching.ui.dialog.DateDialog;
 import cgeo.geocaching.utils.Log;
 import cgeo.geocaching.utils.LogTemplateProvider.LogContext;
 
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import android.app.Dialog;
@@ -117,7 +117,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState, R.layout.logtrackable_activity);
-        Views.inject(this);
+        ButterKnife.inject(this);
 
         // get parameters
         final Bundle extras = getIntent().getExtras();
@@ -130,7 +130,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
             }
         }
 
-        trackable = cgData.loadTrackable(geocode);
+        trackable = DataStore.loadTrackable(geocode);
 
         if (StringUtils.isNotBlank(trackable.getName())) {
             setTitle(res.getString(R.string.trackable_touch) + ": " + trackable.getName());
@@ -335,7 +335,7 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
             if (status == StatusCode.NO_ERROR && Settings.isUseTwitter() &&
                     Settings.isTwitterLoginValid() &&
                     tweetCheck.isChecked() && tweetBox.getVisibility() == View.VISIBLE) {
-                Twitter.postTweetTrackable(geocode);
+                Twitter.postTweetTrackable(geocode, new LogEntry(0, typeSelected, log));
             }
 
             return status;
@@ -356,6 +356,6 @@ public class LogTrackableActivity extends AbstractLoggingActivity implements Dat
 
     @Override
     protected LogContext getLogContext() {
-        return new LogContext(trackable);
+        return new LogContext(trackable, null);
     }
 }