~singpolyma/cheogram-android

3dc9db38f3727f42608d416bac79649e67e2a480 — Stephen Paul Weber 10 months ago ec332d8
Move lock out of bar

And clear history into more options
M src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java => src/main/java/eu/siacs/conversations/ui/util/ConversationMenuConfigurator.java +3 -3
@@ 109,15 109,15 @@ public class ConversationMenuConfigurator {
		axolotl.setVisible(Config.supportOmemo());
		switch (conversation.getNextEncryption()) {
			case Message.ENCRYPTION_PGP:
				menuSecure.setTitle(R.string.encrypted_with_openpgp);
				//menuSecure.setTitle(R.string.encrypted_with_openpgp);
				pgp.setChecked(true);
				break;
			case Message.ENCRYPTION_AXOLOTL:
				menuSecure.setTitle(R.string.encrypted_with_omemo);
				//menuSecure.setTitle(R.string.encrypted_with_omemo);
				axolotl.setChecked(true);
				break;
			default:
				menuSecure.setTitle(R.string.not_encrypted);
				//menuSecure.setTitle(R.string.not_encrypted);
				none.setChecked(true);
				break;
		}

M src/main/res/menu/fragment_conversation.xml => src/main/res/menu/fragment_conversation.xml +27 -28
@@ 25,26 25,6 @@
        </menu>
    </item>
    <item
        android:id="@+id/action_security"
        android:icon="?attr/icon_not_secure"
        android:orderInCategory="20"
        android:title="@string/encrypted_with_omemo"
        app:showAsAction="always">
        <menu>
            <group android:checkableBehavior="single">
                <item
                    android:id="@+id/encryption_choice_none"
                    android:title="@string/encryption_choice_unencrypted" />
                <item
                    android:id="@+id/encryption_choice_axolotl"
                    android:title="@string/encryption_choice_omemo" />
                <item
                    android:id="@+id/encryption_choice_pgp"
                    android:title="@string/encryption_choice_pgp" />
            </group>
        </menu>
    </item>
    <item
        android:id="@+id/action_attach_file"
        android:icon="?attr/icon_new_attachment"
        android:orderInCategory="30"


@@ 106,16 86,31 @@
        android:visible="@bool/show_individual_search_options"
        app:showAsAction="never" />
    <item
        android:id="@+id/action_clear_history"
        android:orderInCategory="50"
        android:title="@string/action_clear_history"
        app:showAsAction="never" />
    <item
        android:id="@+id/action_archive"
        android:orderInCategory="60"
        android:title="@string/action_end_conversation"
        app:showAsAction="never" />
    <item
        android:id="@+id/action_security"
        android:icon="?attr/icon_not_secure"
        android:orderInCategory="65"
        android:title="Encyption"
        app:showAsAction="never">
        <menu>
            <group android:checkableBehavior="single">
                <item
                    android:id="@+id/encryption_choice_none"
                    android:title="@string/encryption_choice_unencrypted" />
                <item
                    android:id="@+id/encryption_choice_axolotl"
                    android:title="@string/encryption_choice_omemo" />
                <item
                    android:id="@+id/encryption_choice_pgp"
                    android:title="@string/encryption_choice_pgp" />
            </group>
        </menu>
    </item>
    <item
        android:orderInCategory="70"
        android:title="@string/more_options">
        <menu>


@@ 137,12 132,16 @@
                app:showAsAction="never" />

            <item
                android:id="@+id/action_refresh_feature_discovery"
                android:id="@+id/action_clear_history"
                android:orderInCategory="74"
                android:title="@string/action_clear_history"
                app:showAsAction="never" />

            <item
                android:id="@+id/action_refresh_feature_discovery"
                android:orderInCategory="75"
                android:title="Refresh Feature Discovery"
                app:showAsAction="never" />
        </menu>
    </item>


</menu>