From f39a03107a3253b14f87a3e6e4ddd96e2fc88a32 Mon Sep 17 00:00:00 2001 From: NudeDude Date: Thu, 4 Apr 2019 21:42:26 +0200 Subject: [PATCH] bug fix --- .../java/org/nuclearfog/twidda/MainActivity.java | 2 +- .../org/nuclearfog/twidda/backend/StatusLoader.java | 2 +- .../org/nuclearfog/twidda/backend/items/Tweet.java | 2 +- .../org/nuclearfog/twidda/database/AppDatabase.java | 2 -- .../org/nuclearfog/twidda/window/SearchPage.java | 2 +- .../org/nuclearfog/twidda/window/TweetDetail.java | 12 ++++++------ .../org/nuclearfog/twidda/window/UserProfile.java | 2 +- app/src/main/res/layout/page_login.xml | 1 - app/src/main/res/values-de-rDE/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 10 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java index 25de10f1..0cb8c021 100644 --- a/app/src/main/java/org/nuclearfog/twidda/MainActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/MainActivity.java @@ -368,7 +368,7 @@ public class MainActivity extends AppCompatActivity implements OnRefreshListener Intent intent = new Intent(this, TweetDetail.class); intent.putExtra("tweetID", tweetId); intent.putExtra("userID", userId); - intent.putExtra("username", username.substring(1)); + intent.putExtra("username", username); startActivityForResult(intent, TWEET); } diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java index e8b6a58f..3103bdff 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java @@ -253,7 +253,7 @@ public class StatusLoader extends AsyncTask { public void onClick(View v) { Intent profile = new Intent(ui.get(), UserProfile.class); profile.putExtra("userID", tweet.getUser().getId()); - profile.putExtra("username", tweet.getUser().getUsername()); + profile.putExtra("username", tweet.getUser().getScreenname()); ui.get().startActivity(profile); } }); diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java b/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java index ade76300..98c75f47 100644 --- a/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java +++ b/app/src/main/java/org/nuclearfog/twidda/backend/items/Tweet.java @@ -36,7 +36,7 @@ public class Tweet { tweet = getText(status); time = status.getCreatedAt().getTime(); replyID = status.getInReplyToStatusId(); - replyName = status.getInReplyToScreenName(); + replyName = '@' + status.getInReplyToScreenName(); media = getMediaLinks(status); retweeted = status.isRetweeted(); favored = status.isFavorited(); diff --git a/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java b/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java index e42309d0..0ee2a051 100644 --- a/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java +++ b/app/src/main/java/org/nuclearfog/twidda/database/AppDatabase.java @@ -68,8 +68,6 @@ public class AppDatabase extends SQLiteOpenHelper { } if(oldVersion < 3 && newVersion >=3) { db.execSQL("DROP TABLE favorit"); - db.execSQL("DROP INDEX idx_tweet"); - db.execSQL(favoriteTable); db.execSQL(INDX_TWEET); diff --git a/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java b/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java index c50dbd67..603d9f13 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/SearchPage.java @@ -183,7 +183,7 @@ public class SearchPage extends AppCompatActivity implements OnRefreshListener, Intent tweetdetail = new Intent(this, TweetDetail.class); tweetdetail.putExtra("tweetID", tweet.getId()); tweetdetail.putExtra("userID", tweet.getUser().getId()); - tweetdetail.putExtra("username", tweet.getUser().getScreenname().substring(1)); + tweetdetail.putExtra("username", tweet.getUser().getScreenname()); startActivity(tweetdetail); break; diff --git a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java index 5f4ce4b1..48e22f3b 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/TweetDetail.java @@ -184,7 +184,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, case R.id.tweet_link: if (mConnect.getActiveNetworkInfo() != null && mConnect.getActiveNetworkInfo().isConnected()) { Intent intent = new Intent(Intent.ACTION_VIEW); - String tweetLink = "https://twitter.com/" + username + "/status/" + tweetID; + String tweetLink = "https://twitter.com/" + username.substring(1) + "/status/" + tweetID; intent.setData(Uri.parse(tweetLink)); startActivity(intent); } else { @@ -193,7 +193,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, break; case R.id.link_copy: - String tweetLink = "https://twitter.com/" + username + "/status/" + tweetID; + String tweetLink = "https://twitter.com/" + username.substring(1) + "/status/" + tweetID; ClipboardManager clip = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE); ClipData linkClip = ClipData.newPlainText("tweet link", tweetLink); clip.setPrimaryClip(linkClip); @@ -242,7 +242,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, case R.id.answer_button: Intent tweet = new Intent(this, TweetPopup.class); tweet.putExtra("TweetID", tweetID); - tweet.putExtra("Addition", '@'+username); + tweet.putExtra("Addition", username); startActivityForResult(tweet, TWEET); break; } @@ -265,7 +265,7 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, Intent intent = new Intent(this, TweetDetail.class); intent.putExtra("tweetID", tweet.getId()); intent.putExtra("userID", tweet.getUser().getId()); - intent.putExtra("username", tweet.getUser().getScreenname().substring(1)); + intent.putExtra("username", tweet.getUser().getScreenname()); startActivityForResult(intent, TWEET); } } @@ -297,9 +297,9 @@ public class TweetDetail extends AppCompatActivity implements OnClickListener, Matcher linkMatch = linkPattern.matcher(link); if (linkMatch.matches()) { if(link.startsWith("/@")) - link = link.substring(2); - else link = link.substring(1); + else + link = '@' + link.substring(1); int end = link.indexOf('/'); username = link.substring(0,end); 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 1014023b..bcf59b31 100644 --- a/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java +++ b/app/src/main/java/org/nuclearfog/twidda/window/UserProfile.java @@ -379,7 +379,7 @@ public class UserProfile extends AppCompatActivity implements OnRefreshListener, Intent intent = new Intent(this, TweetDetail.class); intent.putExtra("tweetID", tweetId); intent.putExtra("userID", userId); - intent.putExtra("username", username.substring(1)); + intent.putExtra("username", username); startActivityForResult(intent, TWEET); } diff --git a/app/src/main/res/layout/page_login.xml b/app/src/main/res/layout/page_login.xml index d73bddaa..bc3a2d79 100644 --- a/app/src/main/res/layout/page_login.xml +++ b/app/src/main/res/layout/page_login.xml @@ -1,7 +1,6 @@ geblockt! entblockt! Tweet gelöscht! - antwort @ + "antwort " "gesendet von: " abbrechen Stummschalten diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d8d271d8..8301349a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,7 +50,7 @@ blocked unblocked Tweet removed! - answering @ + answering sent from: stop loading World ID