Skip to content
This repository was archived by the owner on Sep 4, 2019. It is now read-only.

Commit 7f2127d

Browse files
psyrendustpsyrendust
committed
Merge pull request #3 from csabahenk/master
Thanks for the patch. I'll add this into the 6.0.4 tag.
2 parents 4b8daa9 + 730d4ea commit 7f2127d

File tree

2 files changed

+156
-0
lines changed

2 files changed

+156
-0
lines changed

‎Other_Tools/Kindle_for_Android_Patches/kindle_version_4.3.0.67/Changelog‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
changes from 4.0.2.1 to 4.3.0.67:
2+
- minor adjustment in smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
3+
to make the patch apply cleanly

‎Other_Tools/Kindle_for_Android_Patches/kindle_version_4.3.0.67/kindle4.3.0.67.patch‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali kindle4.3.0.67/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali
2+
--- kindle4.3.0.67_orig/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali 2014-01-13 00:32:44.788420082 +0100
3+
+++ kindle4.3.0.67/smali/com/amazon/kcp/application/AndroidDeviceInformationProvider.smali 2014-01-11 17:57:20.439183833 +0100
4+
@@ -43,6 +43,8 @@
5+
6+
.field private security:Lcom/mobipocket/android/library/reader/AndroidSecurity;
7+
8+
+.field private pidList:Ljava/lang/String;
9+
+
10+
.field private totalMemory:J
11+
12+
13+
@@ -83,6 +85,10 @@
14+
15+
iput-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->deviceType:Lcom/amazon/kcp/application/AmazonDeviceType;
16+
17+
+ const-string v0, "Open DRMed book to show PID list."
18+
+
19+
+ iput-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
20+
+
21+
.line 134
22+
sget-object v0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->TAG:Ljava/lang/String;
23+
24+
@@ -1348,3 +1354,25 @@
25+
26+
return-wide v0
27+
.end method
28+
+
29+
+.method public getPidList()Ljava/lang/String;
30+
+ .locals 1
31+
+
32+
+ .prologue
33+
+ .line 15
34+
+ iget-object v0, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
35+
+
36+
+ return-object v0
37+
+.end method
38+
+
39+
+.method public setPidList(Ljava/lang/String;)V
40+
+ .locals 0
41+
+ .parameter "value"
42+
+
43+
+ .prologue
44+
+ .line 11
45+
+ iput-object p1, p0, Lcom/amazon/kcp/application/AndroidDeviceInformationProvider;->pidList:Ljava/lang/String;
46+
+
47+
+ .line 12
48+
+ return-void
49+
+.end method
50+
Only in kindle4.3.0.67/smali/com/amazon/kcp/application: AndroidDeviceInformationProvider.smali.rej
51+
diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali kindle4.3.0.67/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali
52+
--- kindle4.3.0.67_orig/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali 2014-01-13 00:32:45.121755742 +0100
53+
+++ kindle4.3.0.67/smali/com/amazon/kcp/application/IDeviceInformationProvider.smali 2014-01-11 17:54:48.949501717 +0100
54+
@@ -30,3 +30,9 @@
55+
56+
.method public abstract getPid()Ljava/lang/String;
57+
.end method
58+
+
59+
+.method public abstract getPidList()Ljava/lang/String;
60+
+.end method
61+
+
62+
+.method public abstract setPidList(Ljava/lang/String;)V
63+
+.end method
64+
diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/kcp/info/AboutActivity.smali kindle4.3.0.67/smali/com/amazon/kcp/info/AboutActivity.smali
65+
--- kindle4.3.0.67_orig/smali/com/amazon/kcp/info/AboutActivity.smali 2014-01-13 00:32:46.291763912 +0100
66+
+++ kindle4.3.0.67/smali/com/amazon/kcp/info/AboutActivity.smali 2014-01-11 17:54:48.949501717 +0100
67+
@@ -493,6 +493,57 @@
68+
return-void
69+
.end method
70+
71+
+.method private populatePIDList()V
72+
+ .locals 7
73+
+
74+
+ .prologue
75+
+ .line 313
76+
+ invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
77+
+
78+
+ move-result-object v0
79+
+
80+
+ invoke-interface {v0}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->getPidList()Ljava/lang/String;
81+
+
82+
+ move-result-object v1
83+
+
84+
+ .line 314
85+
+ .local v1, PidList:Ljava/lang/String;
86+
+ iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->groupItemList:Ljava/util/List;
87+
+
88+
+ new-instance v4, Lcom/amazon/kcp/info/AboutActivity$GroupItem;
89+
+
90+
+ const-string v5, "PID List"
91+
+
92+
+ const v6, 0x1
93+
+
94+
+ invoke-direct {v4, p0, v5, v6}, Lcom/amazon/kcp/info/AboutActivity$GroupItem;-><init>(Lcom/amazon/kcp/info/AboutActivity;Ljava/lang/String;Z)V
95+
+
96+
+ invoke-interface {v3, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z
97+
+
98+
+ .line 315
99+
+ new-instance v2, Ljava/util/ArrayList;
100+
+
101+
+ invoke-direct {v2}, Ljava/util/ArrayList;-><init>()V
102+
+
103+
+ .line 316
104+
+ .local v2, children:Ljava/util/List;,"Ljava/util/List<Lcom/amazon/kcp/info/AboutActivity$DetailItem;>;"
105+
+ new-instance v3, Lcom/amazon/kcp/info/AboutActivity$DetailItem;
106+
+
107+
+ const-string v4, "PIDs"
108+
+
109+
+ invoke-direct {v3, p0, v4, v1}, Lcom/amazon/kcp/info/AboutActivity$DetailItem;-><init>(Lcom/amazon/kcp/info/AboutActivity;Ljava/lang/String;Ljava/lang/String;)V
110+
+
111+
+ invoke-interface {v2, v3}, Ljava/util/List;->add(Ljava/lang/Object;)Z
112+
+
113+
+ .line 317
114+
+ iget-object v3, p0, Lcom/amazon/kcp/info/AboutActivity;->detailItemList:Ljava/util/List;
115+
+
116+
+ invoke-interface {v3, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z
117+
+
118+
+ .line 318
119+
+ return-void
120+
+.end method
121+
+
122+
.method private populateDisplayItems()V
123+
.locals 1
124+
125+
@@ -538,6 +589,8 @@
126+
.line 194
127+
invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populateDisplayInformation()V
128+
129+
+ invoke-direct {p0}, Lcom/amazon/kcp/info/AboutActivity;->populatePIDList()V
130+
+
131+
.line 195
132+
return-void
133+
134+
diff -ru '--exclude=.git' kindle4.3.0.67_orig/smali/com/amazon/system/security/Security.smali kindle4.3.0.67/smali/com/amazon/system/security/Security.smali
135+
--- kindle4.3.0.67_orig/smali/com/amazon/system/security/Security.smali 2014-01-13 00:32:59.355188695 +0100
136+
+++ kindle4.3.0.67/smali/com/amazon/system/security/Security.smali 2014-01-11 17:54:48.949501717 +0100
137+
@@ -942,6 +942,16 @@
138+
139+
aput-object v0, v6, v8
140+
141+
+ invoke-static {}, Lcom/amazon/kcp/application/DeviceInformationProviderFactory;->getProvider()Lcom/amazon/kcp/application/IDeviceInformationProvider;
142+
+
143+
+ move-result-object v5
144+
+
145+
+ invoke-static {v6}, Ljava/util/Arrays;->toString([Ljava/lang/Object;)Ljava/lang/String;
146+
+
147+
+ move-result-object v2
148+
+
149+
+ invoke-interface {v5, v2}, Lcom/amazon/kcp/application/IDeviceInformationProvider;->setPidList(Ljava/lang/String;)V
150+
+
151+
.line 353
152+
return-object v6
153+
.end method

0 commit comments

Comments
 (0)