Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 11:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore the 3-dot menu when creating a PIN.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-01-27 17:28:05 -05:00
parent 7348224dc2
commit e12bbe943b
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
View File

@@ -17,6 +17,8 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.Toolbar;
import org.thoughtcrime.securesms.LoggingFragment;
import org.thoughtcrime.securesms.R;
@@ -73,6 +75,10 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
CommunicationActions.openBrowserLink(requireContext(), getString(R.string.BaseKbsPinFragment__learn_more_url));
});
Toolbar toolbar = view.findViewById(R.id.kbs_pin_toolbar);
((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
((AppCompatActivity) requireActivity()).getSupportActionBar().setTitle(null);
initializeListeners();
}
@@ -100,16 +106,15 @@ public abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel>
@Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_pin_learn_more:
onLearnMore();
return true;
case R.id.menu_pin_skip:
onPinSkipped();
return true;
if (item.getItemId() == R.id.menu_pin_learn_more) {
onLearnMore();
return true;
} else if (item.getItemId() == R.id.menu_pin_skip) {
onPinSkipped();
return true;
} else {
return false;
}
return false;
}
protected abstract ViewModel initializeViewModel();