TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-01-11 16:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix recursive experience upgrade activity problem

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2017-09-06 00:29:49 -07:00
parent efc4a5ab9d
commit 19be527370
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/profile_create_activity.xml
View File

@ -21,10 +21,12 @@
<org.thoughtcrime.securesms.components.emoji.EmojiEditText
android:id="@+id/name"
android:hint="@string/profile_create_activity__your_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_weight="1"
android:layout_marginLeft="10dp"
android:inputType="textCapWords"/>
<org.thoughtcrime.securesms.components.emoji.EmojiToggle

2
res/values/strings.xml
View File

@ -983,6 +983,7 @@
<string name="profile_create_activity__set_later">Set later</string>
<string name="profile_create_activity__finish">FINISH</string>
<string name="profile_create_activity__who_can_see_this_information">Who can see this information?</string>
<string name="profile_create_activity__your_name">Your name</string>
<!-- recipient_preferences_activity -->
<string name="recipient_preference_activity__blocked">BLOCKED</string>
@ -1456,6 +1457,7 @@
<string name="transport_selection_list_item__transport_icon">Transport icon</string>
<!-- EOF -->
</resources>

8
src/org/thoughtcrime/securesms/CreateProfileActivity.java
View File

@ -8,7 +8,6 @@ import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.provider.MediaStore;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.text.Editable;
import android.text.TextUtils;
@ -30,7 +29,6 @@ import org.thoughtcrime.securesms.components.emoji.EmojiDrawer;
import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhoto;
import org.thoughtcrime.securesms.contacts.avatars.ContactPhotoFactory;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
import org.thoughtcrime.securesms.database.Address;
import org.thoughtcrime.securesms.dependencies.InjectableType;
@ -61,7 +59,7 @@ import javax.inject.Inject;
import static android.provider.MediaStore.EXTRA_OUTPUT;
public class CreateProfileActivity extends PassphraseRequiredActionBarActivity implements InjectableType {
public class CreateProfileActivity extends BaseActionBarActivity implements InjectableType {
private static final String TAG = CreateProfileActivity.class.getSimpleName();
@ -84,8 +82,8 @@ public class CreateProfileActivity extends PassphraseRequiredActionBarActivity i
private File captureFile;
@Override
public void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
super.onCreate(bundle, masterSecret);
public void onCreate(Bundle bundle) {
super.onCreate(bundle);
setContentView(R.layout.profile_create_activity);