Compare commits

...

3 Commits

Author SHA1 Message Date
Moxie Marlinspike
c1fe585ffb Bump version to 2.6.3
// FREEBIE
2015-03-09 13:32:11 -07:00
Moxie Marlinspike
078df0f029 Update key conflict message in place.
// FREEBIE
2015-03-09 13:15:24 -07:00
Moxie Marlinspike
9f9293cd61 Pending indicator was not cleared on recycled views.
// FREEBIE
2015-03-09 13:14:39 -07:00
3 changed files with 3 additions and 5 deletions

View File

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.thoughtcrime.securesms"
android:versionCode="97"
android:versionName="2.6.2">
android:versionCode="98"
android:versionName="2.6.3">
<permission android:name="org.thoughtcrime.securesms.ACCESS_SECRETS"
android:label="Access to TextSecure Secrets"

View File

@@ -280,7 +280,7 @@ public class ConversationItem extends LinearLayout {
private void setStatusIcons(MessageRecord messageRecord) {
failedImage.setVisibility(messageRecord.isFailed() ? View.VISIBLE : View.GONE);
// pendingIndicator.setVisibility(View.GONE);
if (messageRecord.isOutgoing()) pendingIndicator.setVisibility(View.GONE);
if (messageRecord.isOutgoing()) indicatorText.setVisibility(View.GONE);
secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);

View File

@@ -236,8 +236,6 @@ public class ReceiveKeyActivity extends BaseActivity {
ApplicationContext.getInstance(context)
.getJobManager()
.add(new PushDecryptJob(context, pushId, messageId, message.getSender()));
smsDatabase.deleteMessage(messageId);
} catch (IOException e) {
throw new AssertionError(e);
}