Compare commits

...

47 commits

Author SHA1 Message Date
38badc85d8
10.2.9 2020-01-28 13:33:35 +00:00
9b11df5b8a
10.2.6 2020-01-23 00:10:58 +00:00
4ad1d8b1fb
10.2.5 2020-01-22 15:07:58 +00:00
77a9be7f28
Fix bettertm and bettertmlight patches 2020-01-18 14:52:50 +00:00
ab77dffe6a
10.2.4 2020-01-18 14:22:16 +00:00
Ave
fce83e9ba8 Merge branch '1023' of Juby210/cutthecord into master 2020-01-17 16:59:56 +00:00
3fc567f17f 10.2.3 2020-01-17 13:43:45 +01:00
65e3d20105
10.2.2 2020-01-16 11:53:22 +03:00
328eac4c48
Fix slashcommands when message contains attachments 2020-01-14 13:30:13 +00:00
0f49fcd527 Merge branch '1021' of eatsfoobars/cutthecord into master 2020-01-14 12:48:53 +00:00
9b38cb8b5b
10.2.1 2020-01-14 12:28:31 +00:00
a5e58aab0c
customtheme: Solve spoiler and muted channel colors on 10.2.0 2020-01-12 12:50:09 +03:00
Ave
9db51f285e Merge branch '1020' of eatsfoobars/cutthecord into master 2020-01-12 08:57:15 +00:00
042930a1b2
10.2.0 2020-01-11 15:51:19 +00:00
50bb804418
slashcommands:Fix 10.1.9 builds 2020-01-10 17:08:24 +03:00
454decdc31
10.1.9
thanks to discord for hardcoding colors again 🖕
2020-01-10 16:31:26 +03:00
Ave
826cde9d44 Merge branch '1016' of eatsfoobars/cutthecord into master 2020-01-07 13:40:33 +00:00
5e8dffdcd2
10.1.6 2020-01-03 17:15:51 +02:00
Ave
230e43e4be Merge branch '1015' of eatsfoobars/cutthecord into master 2019-12-29 16:20:30 +00:00
5a282fef3f
10.1.5 2019-12-29 13:10:20 +02:00
817f412c12
fix crash on 10.1.3
closes #44
2019-12-21 23:02:59 +03:00
8518d759e1
I'm a silly person that forgot to commit this 2019-12-21 22:13:17 +03:00
2b89b9b6a0
Re-port 10.1.3
Revert "10.1.3"

This reverts commit 12c11a1451.

Re-port 10.1.3
2019-12-21 21:52:39 +03:00
2be217b2c3
Revert "More attempts to fix /ctc slashcommands on 10.1.3"
This reverts commit 359441a1f5.
2019-12-21 21:29:40 +03:00
359441a1f5
More attempts to fix /ctc slashcommands on 10.1.3 2019-12-21 21:08:54 +03:00
89a5dd1989
Fix some issues no 10.1.3
Closes #43
2019-12-21 21:01:40 +03:00
Ave
6c67440a91 Merge branch '1013' of eatsfoobars/cutthecord into master 2019-12-21 10:14:32 +00:00
12c11a1451
10.1.3 2019-12-21 12:13:30 +02:00
Ave
d3cbb7c760 Merge branch '1012' of eatsfoobars/cutthecord into master 2019-12-20 18:49:22 +00:00
45947d7e78
10.1.2 2019-12-20 17:33:13 +02:00
bf679ad046
10.1.1 2019-12-19 02:09:54 +03:00
ee77823392
10.0.7
Also fix a bug that prevents installation of multiple branches /
official client, thanks whovian for pointing it out.
2019-12-15 13:44:16 +03:00
4bc5ffc081
litecord: properly split from nozlib on 1006 2019-12-13 14:00:27 +03:00
41ef69968d
experiments: fix a crash on 1006 2019-12-13 13:05:35 +03:00
458d5f4225
Remove requestLegacyExternalStorage to make builds run 2019-12-13 12:52:29 +03:00
91b6f28d2d
oh come on 2019-12-13 12:43:59 +03:00
e46d01f9f3
please build 2019-12-13 12:42:06 +03:00
1f69ccf301
Add a post-script to notrack and make pre/post scripts automatically get
ported
2019-12-13 12:38:55 +03:00
51f1e9079b
10.0.6
smalltime is gone.
2019-12-13 12:26:27 +03:00
Ave
38ac8b7bc2 Merge branch 'fix-conflicting-provider' of eatsfoobars/cutthecord into master 2019-12-06 09:59:00 +00:00
724cb64be8
Fix conflicting provider error 2019-12-06 01:21:23 +00:00
e8b6b3e629
996 2019-12-05 11:26:53 +03:00
c8c7520853
9.9.4
Had to rewrite spoilerimg related parts of supplemental as they moved okhttp3
code to discord's own codebase.

However, one benefit of this for us is that it now shows SPOILER_ while you're
uploading too.
2019-11-28 09:41:59 +03:00
aeac528a16
Release CTC for 9.9.3. 2019-11-27 13:17:50 +03:00
1066c3c5a6
Supplemental: Fix spoilerimg
Closes #39
2019-11-27 13:16:57 +03:00
Ave
4bf12e1e2b Merge branch 'ctcci-fixes' of eatsfoobars/cutthecord into master 2019-11-27 06:08:32 +00:00
e464c9a283
CTC CI: Fix apksigner execution, import requests 2019-11-26 22:53:26 +00:00
492 changed files with 1108592 additions and 10 deletions

View file

@ -2,7 +2,7 @@
Modular Client Mod for Discord's Android app.
**Latest supported Discord Android version:** 9.9.2 (992), released on 2019-11-26.
**Latest supported Discord Android version:** 10.2.9 (1029), released on 2020-01-28.
New patch development will be done for the latest supported version.

View file

@ -2,6 +2,7 @@
import os
import sys
import shutil
import requests
import json
import subprocess
from ctcconfig import *
@ -231,9 +232,9 @@ APK_PATH = os.path.join(WORK_FOLDER, "discord",
# Sign the APK
if DO_APKSIGNER:
subprocess.run(f"apksigner sign --ks {KEYSTORE_FILE}"
subprocess.run(f"apksigner sign --ks {KEYSTORE_FILE} "
f"--ks-key-alias {KEYSTORE_ALIAS} "
f"--ks-pass pass:{KEYSTORE_PASS}"
f"--ks-pass pass:{KEYSTORE_PASS} "
f"{APK_PATH}",
shell=True,
cwd=WORK_FOLDER)

View file

@ -7,3 +7,5 @@ Here's why these patches are no longer maintained in this form:
- notyping: Moved into slashcommands as a slash command
- pureevil: It's now upstream (yay.)
- compact: It's just a pain to maintain.
- smalltime: It's just a pain to maintain.
- customdefaultemoji: There doesn't seem to be default emojis anymore?

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -0,0 +1,80 @@
diff -crB from/smali/com/discord/stores/StoreEmoji.smali to/smali/com/discord/stores/StoreEmoji.smali
*** from/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:32:21.079850865 +0300
--- to/smali/com/discord/stores/StoreEmoji.smali 2019-11-14 22:33:18.846833515 +0300
***************
*** 103,139 ****
const/4 v1, 0x0
! const-string v2, "thinking"
aput-object v2, v0, v1
const/4 v1, 0x1
! const-string v2, "ok_hand"
aput-object v2, v0, v1
const/4 v1, 0x2
! const-string v2, "eyes"
aput-object v2, v0, v1
const/4 v1, 0x3
! const-string v2, "sweat_drops"
aput-object v2, v0, v1
const/4 v1, 0x4
! const-string v2, "joy"
aput-object v2, v0, v1
const/4 v1, 0x5
! const-string v2, "pig"
aput-object v2, v0, v1
--- 103,139 ----
const/4 v1, 0x0
! const-string v2, "star"
aput-object v2, v0, v1
const/4 v1, 0x1
! const-string v2, "thinking"
aput-object v2, v0, v1
const/4 v1, 0x2
! const-string v2, "ok_hand"
aput-object v2, v0, v1
const/4 v1, 0x3
! const-string v2, "eyes"
aput-object v2, v0, v1
const/4 v1, 0x4
! const-string v2, "sweat_drops"
aput-object v2, v0, v1
const/4 v1, 0x5
! const-string v2, "joy"
aput-object v2, v0, v1

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -0,0 +1,43 @@
diff -crB com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali com.discord-992/smali/com/discord/stores/StoreEmoji.smali
*** com.discord-992-base/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 10:48:46.036158964 +0300
--- com.discord-992/smali/com/discord/stores/StoreEmoji.smali 2019-11-26 12:08:01.403160008 +0300
***************
*** 97,113 ****
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "thinking"
! const-string v3, "ok_hand"
! const-string v4, "eyes"
! const-string v5, "sweat_drops"
! const-string v6, "joy"
! const-string v7, "pig"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
--- 97,113 ----
sput-object v0, Lcom/discord/stores/StoreEmoji;->Companion:Lcom/discord/stores/StoreEmoji$Companion;
! const-string v2, "star"
! const-string v3, "thinking"
! const-string v4, "ok_hand"
! const-string v5, "eyes"
! const-string v6, "sweat_drops"
! const-string v7, "joy"
.line 350
filled-new-array/range {v2 .. v7}, [Ljava/lang/String;
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.orig
Only in com.discord-992/smali/com/discord/stores: StoreEmoji.smali.rej

View file

@ -38,4 +38,12 @@ This patch changes default list of custom emojis.
- 9.8.6
- 9.9.1
- 9.9.2
- 9.9.3
- 9.9.4
- 9.9.6
- 10.0.6
- 10.0.7
- 10.1.1
- 10.1.2
- 10.1.3

View file

@ -0,0 +1,190 @@
diff -crB from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali
*** from/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:13:48.187878981 +0300
--- to/smali_classes2/com/miguelgaeta/simple_time/SimpleTime.smali 2019-05-12 12:15:32.663889927 +0300
***************
*** 239,411 ****
.end method
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
! .locals 6
!
! .line 126
! invoke-virtual {p0}, Lcom/miguelgaeta/simple_time/SimpleTime;->currentTimeMillis()J
!
! move-result-wide v0
!
! invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
!
! move-result-object v0
!
! invoke-virtual {p0, v0}, Lcom/miguelgaeta/simple_time/SimpleTime;->toCalendar(Ljava/lang/Long;)Ljava/util/Calendar;
!
! move-result-object v0
!
! const/4 v1, 0x0
!
! const/16 v2, 0xb
!
! .line 128
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
!
! const/16 v2, 0xc
!
! .line 129
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
!
! const/16 v2, 0xd
!
! .line 130
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
!
! const/16 v2, 0xe
!
! .line 131
! invoke-virtual {v0, v2, v1}, Ljava/util/Calendar;->set(II)V
!
! .line 133
! iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->locale:Ljava/util/Locale;
!
! invoke-virtual {v1}, Ljava/util/Locale;->getLanguage()Ljava/lang/String;
!
! move-result-object v1
!
! const-string v2, "en"
!
! invoke-virtual {v1, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
!
! move-result v1
!
! if-nez v1, :cond_1
!
! .line 136
! invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
!
! move-result-wide v1
!
! invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
!
! move-result-wide v3
!
! cmp-long v0, v1, v3
!
! if-lez v0, :cond_0
!
! .line 137
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
- move-result-object p1
-
- return-object p1
-
- .line 139
- :cond_0
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
-
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- .line 143
- :cond_1
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
-
- move-result-wide v1
-
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
-
- move-result-wide v3
-
- cmp-long v5, v1, v3
-
- if-lez v5, :cond_2
-
- .line 144
- new-instance v0, Ljava/lang/StringBuilder;
-
- const-string v1, "Today at "
-
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
-
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object p1
-
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- :cond_2
- const/4 v1, 0x5
-
- const/4 v2, -0x1
-
- .line 147
- invoke-virtual {v0, v1, v2}, Ljava/util/Calendar;->add(II)V
-
- .line 149
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
-
- move-result-wide v1
-
- invoke-virtual {v0}, Ljava/util/Calendar;->getTimeInMillis()J
-
- move-result-wide v3
-
- cmp-long v0, v1, v3
-
- if-lez v0, :cond_3
-
- .line 150
- new-instance v0, Ljava/lang/StringBuilder;
-
- const-string v1, "Yesterday at "
-
- invoke-direct {v0, v1}, Ljava/lang/StringBuilder;-><init>(Ljava/lang/String;)V
-
- iget-object v1, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
-
- invoke-virtual {v1, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object p1
-
- invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- .line 153
- :cond_3
- iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterDateTime:Ljava/text/DateFormat;
-
- invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
-
move-result-object p1
return-object p1
--- 239,249 ----
.end method
.method public toReadableTimeString(Ljava/lang/Long;)Ljava/lang/String;
! .locals 1
iget-object v0, p0, Lcom/miguelgaeta/simple_time/SimpleTime;->formatterTime:Ljava/text/DateFormat;
invoke-virtual {v0, p1}, Ljava/text/DateFormat;->format(Ljava/lang/Object;)Ljava/lang/String;
move-result-object p1
return-object p1

Some files were not shown because too many files have changed in this diff Show more