sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hide regenerate keys button 

Can re-enable it via Config.java setting
This commit is contained in:
Andreas Straub 2015-07-22 01:00:20 +02:00
parent 4c1c2892c7
commit c2813cea29
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/Config.java
View File

@ -37,6 +37,8 @@ public final class Config {
public static final boolean ENCRYPT_ON_HTTP_UPLOADED = false; public static final boolean ENCRYPT_ON_HTTP_UPLOADED = false;
public static final boolean SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON = false;
public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000; public static final long MILLISECONDS_IN_DAY = 24 * 60 * 60 * 1000;
public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY / 2; public static final long MAM_MAX_CATCHUP = MILLISECONDS_IN_DAY / 2;
public static final int MAM_MAX_MESSAGES = 500; public static final int MAM_MAX_MESSAGES = 500;

21
src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
View File

@ -29,6 +29,7 @@ import org.whispersystems.libaxolotl.IdentityKey;
import java.util.Set; import java.util.Set;
import eu.siacs.conversations.Config;
import eu.siacs.conversations.R; import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.entities.Account;
import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate; import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
@ -547,16 +548,18 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
} }
} }
}); });
this.mRegenerateAxolotlKeyButton if (Config.SHOW_REGENERATE_AXOLOTL_KEYS_BUTTON) {
.setVisibility(View.VISIBLE); this.mRegenerateAxolotlKeyButton
this.mRegenerateAxolotlKeyButton .setVisibility(View.VISIBLE);
.setOnClickListener(new View.OnClickListener() { this.mRegenerateAxolotlKeyButton
.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(final View v) { public void onClick(final View v) {
showRegenerateAxolotlKeyDialog(); showRegenerateAxolotlKeyDialog();
} }
}); });
}
} else { } else {
this.mAxolotlFingerprintBox.setVisibility(View.GONE); this.mAxolotlFingerprintBox.setVisibility(View.GONE);
} }

2
src/main/res/layout/activity_edit_account.xml
View File

@ -400,7 +400,7 @@
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:padding="@dimen/image_button_padding" android:padding="@dimen/image_button_padding"
android:src="?attr/icon_refresh" android:src="?attr/icon_refresh"
android:visibility="visible" android:visibility="gone"
android:contentDescription="@string/regenerate_axolotl_key"/> android:contentDescription="@string/regenerate_axolotl_key"/>
</LinearLayout> </LinearLayout>