diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java b/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java
index 5a2796e6..9d98306e 100644
--- a/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java
+++ b/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java
@@ -166,7 +166,10 @@ public class StatusHolder extends ViewHolder implements OnClickListener {
if (status.getRepliedStatusId() > 0) {
replyIcon.setVisibility(View.VISIBLE);
replyname.setVisibility(View.VISIBLE);
- replyname.setText(status.getReplyName());
+ if (!status.getReplyName().isEmpty())
+ replyname.setText(status.getReplyName());
+ else
+ replyname.setText(R.string.status_replyname_empty);
} else {
replyIcon.setVisibility(View.GONE);
replyname.setVisibility(View.GONE);
diff --git a/app/src/main/java/org/nuclearfog/twidda/database/AccountDatabase.java b/app/src/main/java/org/nuclearfog/twidda/database/AccountDatabase.java
index 3fcf7f7f..5961c1a2 100644
--- a/app/src/main/java/org/nuclearfog/twidda/database/AccountDatabase.java
+++ b/app/src/main/java/org/nuclearfog/twidda/database/AccountDatabase.java
@@ -59,7 +59,7 @@ public class AccountDatabase {
values.put(AccountTable.CLIENT_SECRET, account.getConsumerSecret());
values.put(AccountTable.API, account.getApiType());
values.put(AccountTable.ACCESS_TOKEN, account.getOauthToken());
- values.put(AccountTable.ACCESS_TOKEN, account.getOauthToken());
+ values.put(AccountTable.TOKEN_SECRET, account.getOauthSecret());
values.put(AccountTable.BEARER, account.getBearerToken());
SQLiteDatabase db = dataHelper.getDatabase();
db.beginTransaction();
diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
index 00dbc82a..012fb647 100644
--- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
+++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/StatusActivity.java
@@ -675,7 +675,10 @@ public class StatusActivity extends AppCompatActivity implements OnClickListener
statusText.setVisibility(GONE);
}
if (status.getRepliedStatusId() > 0) {
- replyName.setText(status.getReplyName());
+ if (!status.getReplyName().isEmpty())
+ replyName.setText(status.getReplyName());
+ else
+ replyName.setText(R.string.status_replyname_empty);
replyName.setVisibility(VISIBLE);
} else {
replyName.setVisibility(GONE);
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 43de8daa..60895a5a 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -249,4 +249,5 @@
Bitte Schlüssel hinzufügen
%1$s ausgewählt
Nachricht schreiben
+ Antwort
\ 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 746877f5..53404ca0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -284,5 +284,6 @@
%1$s request to follow you
%1$s mentioned you
%1$s reposted your status
+ Reply
\ No newline at end of file