diff --git a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java index d50e09d7..a0460bbf 100644 --- a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java @@ -185,9 +185,9 @@ public class MainActivity extends AppCompatActivity implements AdapterView.OnIte startActivity(intent); } break; - case R.id.mention: + case R.id.m_list: if(!mentionReload.isRefreshing()) { - TimelineAdapter tlAdp = (TimelineAdapter) timelineList.getAdapter(); + TimelineAdapter tlAdp = (TimelineAdapter) mentionList.getAdapter(); TweetDatabase twDB = tlAdp.getAdapter(); long tweetID = twDB.getTweetId(position); long userID = twDB.getUserID(position); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java index e4417a4e..78f2a777 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/MainPage.java @@ -30,7 +30,6 @@ public class MainPage extends AsyncTask private SharedPreferences settings; private int load; - /** * Main View * @see MainActivity @@ -40,7 +39,7 @@ public class MainPage extends AsyncTask twitterResource = TwitterResource.getInstance(context); twitterResource.init();// preload settings = context.getSharedPreferences("settings", 0); - load = settings.getInt("preload", 10); + load = settings.getInt("preload", 10) + 1; } @Override diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileAction.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileAction.java index 7557b834..9499ad5d 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileAction.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileAction.java @@ -48,12 +48,17 @@ public class ProfileAction extends AsyncTask private int load; private long homeUserID; + /** + * @param context Context to Activity + * @param tool Actionbar + * @see UserProfile + */ public ProfileAction(Context context, Toolbar tool) { this.context=context; this.tool = tool; SharedPreferences settings = context.getSharedPreferences("settings", 0); imgEnabled = settings.getBoolean("image_load",false); - load = settings.getInt("preload", 10); + load = settings.getInt("preload", 10) + 1; homeUserID = settings.getLong("userID", -1); } @@ -138,10 +143,10 @@ public class ProfileAction extends AsyncTask else if(MODE == ACTION_MUTE) { if(muted) { - twitter.destroyMute(userId); + twitter.destroyBlock(userId); muted = false; } else { - twitter.createMute(userId); + twitter.createBlock(userId); muted = true; } } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/Search.java b/app/src/main/java/org/nuclearfog/twidda/backend/Search.java index 82623728..ade9ed02 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/Search.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/Search.java @@ -33,7 +33,7 @@ public class Search extends AsyncTask { public Search(Context context) { this.context=context; SharedPreferences settings = context.getSharedPreferences("settings", 0); - load = settings.getInt("preload", 10); + load = settings.getInt("preload", 10) + 1; } @Override diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ShowStatus.java b/app/src/main/java/org/nuclearfog/twidda/backend/ShowStatus.java index e12f3735..4e205460 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/ShowStatus.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/ShowStatus.java @@ -103,10 +103,10 @@ public class ShowStatus extends AsyncTask { List stats = result.getTweets(); for(twitter4j.Status reply : stats) { - //if(reply.getInReplyToStatusId() == tweetID) { TODO + if(reply.getInReplyToStatusId() == tweetID) { answers.add(reply); ansNo++; - //} + } } if(toggleImg) setMedia(currentTweet); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java index fdc49b69..eb608a39 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java @@ -11,6 +11,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.AdapterView; +import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TabHost; import android.widget.TextView; @@ -68,7 +69,6 @@ public class UserProfile extends AppCompatActivity implements View.OnClickListen tab2.setIndicator("",getResources().getDrawable(R.drawable.favorite_icon)); mTab.addTab(tab2); - mTab.setOnTabChangedListener(this); txtFollowing.setOnClickListener(this); txtFollower.setOnClickListener(this); @@ -189,24 +189,17 @@ public class UserProfile extends AppCompatActivity implements View.OnClickListen } private void getContent() { - new Thread() { - @Override - public void run() { - TweetDatabase mTweet = new TweetDatabase(UserProfile.this, TweetDatabase.USER_TL, userId); - TweetDatabase fTweet = new TweetDatabase(UserProfile.this, TweetDatabase.FAV_TL, userId); + TweetDatabase mTweet = new TweetDatabase(UserProfile.this, TweetDatabase.USER_TL, userId); + TweetDatabase fTweet = new TweetDatabase(UserProfile.this, TweetDatabase.FAV_TL, userId); + if(mTweet.getSize()>0) + homeTweets.setAdapter(new TimelineAdapter(UserProfile.this,mTweet)); + else + new ProfileAction(this, tool).execute(userId, ProfileAction.GET_TWEETS); - if(mTweet.getSize() == 0) { - new ProfileAction(UserProfile.this, tool).execute(userId, ProfileAction.GET_TWEETS); - } else { - homeTweets.setAdapter(new TimelineAdapter(UserProfile.this,mTweet)); - } - if(fTweet.getSize() == 0) { - new ProfileAction(UserProfile.this, tool).execute(userId, ProfileAction.GET_FAVS); - } else { - homeFavorits.setAdapter(new TimelineAdapter(UserProfile.this,fTweet)); - } - } - }.run(); + if(fTweet.getSize()>0) + homeFavorits.setAdapter(new TimelineAdapter(UserProfile.this,fTweet)); + else + new ProfileAction(this, tool).execute(userId, ProfileAction.GET_FAVS); } private void initElements() { diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml new file mode 100644 index 00000000..06461537 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_down.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/layout/profile.xml b/app/src/main/res/layout/profile.xml index 42b13dbc..162ebea9 100644 --- a/app/src/main/res/layout/profile.xml +++ b/app/src/main/res/layout/profile.xml @@ -1,7 +1,6 @@ @@ -85,7 +84,9 @@ android:layout_height="wrap_content" android:layout_weight="1" /> + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 28359314..672edf4d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -80,5 +80,6 @@ trendname TEXT, trendlink TEXT); + Aktualisieren \ No newline at end of file