Skip to content

Commit 358c923

Browse files
committed
Merge pull request signalapp#1630 from mcginty/remove-keys-list
remove ReviewIdentitiesActivity
2 parents 2d9cd8e + f63f954 commit 358c923

14 files changed

Lines changed: 1 addition & 194 deletions

AndroidManifest.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,7 @@
172172
android:label="@string/AndroidManifest__verify_identity"
173173
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
174174

175-
<activity android:name=".ReviewIdentitiesActivity"
176-
android:label="@string/AndroidManifest__manage_identity_keys"
177-
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
178-
179-
<activity android:name=".ReceiveKeyActivity"
175+
<activity android:name=".ReceiveKeyActivity"
180176
android:label="@string/AndroidManifest__complete_key_exchange"
181177
android:theme="@style/TextSecure.Light.Dialog"
182178
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
-949 Bytes
Binary file not shown.
-910 Bytes
Binary file not shown.
-575 Bytes
Binary file not shown.
-546 Bytes
Binary file not shown.
-1.3 KB
Binary file not shown.
-1.22 KB
Binary file not shown.

res/layout/review_identities.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

res/layout/review_identities_fragment.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

res/values/arrays.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -128,24 +128,20 @@
128128
<string-array name="navigation_drawer_text">
129129
<item>@string/arrays__import_export</item>
130130
<item>@string/arrays__my_identity_key</item>
131-
<item>@string/arrays__contact_keys</item>
132131
</string-array>
133132

134133
<string-array name="navigation_drawer_values" translatable="false">
135134
<item>import_export</item>
136135
<item>my_identity_key</item>
137-
<item>contact_identity_keys</item>
138136
</string-array>
139137

140138
<string-array name="navigation_drawer_icons_light">
141139
<item>@drawable/import_export_light</item>
142140
<item>@drawable/my_identity_light</item>
143-
<item>@drawable/contacts_identities_light</item>
144141
</string-array>
145142

146143
<string-array name="navigation_drawer_icons_dark">
147144
<item>@drawable/import_export_dark</item>
148145
<item>@drawable/my_identity_dark</item>
149-
<item>@drawable/contacts_identities_dark</item>
150146
</string-array>
151147
</resources>

0 commit comments

Comments
 (0)