Skip to content

Commit c004a26

Browse files
authored
Merge pull request #167 from FlowCrypt/0.4.0
0.4.0
2 parents bc43377 + fd280f2 commit c004a26

File tree

94 files changed

+4451
-1484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+4451
-1484
lines changed

.idea/copyright/FlowCrypt.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/copyright/profiles_settings.xml

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

FlowCrypt/src/main/AndroidManifest.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,14 @@
8686
android:label="@string/keys"
8787
android:screenOrientation="portrait" />
8888

89+
<activity
90+
android:name=".ui.activity.settings.AttesterSettingsActivity"
91+
android:label="@string/attester"
92+
android:screenOrientation="portrait" />
93+
8994
<activity
9095
android:name=".ui.activity.settings.BackupSettingsActivity"
91-
android:label="@string/backup"
96+
android:label="@string/backups"
9297
android:screenOrientation="portrait" />
9398

9499
<activity
@@ -116,7 +121,13 @@
116121
android:label="@string/adding_new_account"
117122
android:screenOrientation="portrait" />
118123

119-
<activity android:name=".ui.activity.DevSettingsActivity" />
124+
<activity
125+
android:name=".ui.activity.DevSettingsActivity"
126+
android:screenOrientation="portrait" />
127+
128+
<activity
129+
android:name=".ui.activity.SelectContactsActivity"
130+
android:screenOrientation="portrait" />
120131

121132
<!-- Providers -->
122133
<provider

0 commit comments

Comments
 (0)