From c69f2fd75d9e2647a094cccb8f7eedac4afa7464 Mon Sep 17 00:00:00 2001 From: "B. Petersen" Date: Fri, 9 Dec 2016 13:10:35 +0100 Subject: [PATCH] Add invite function. --- MessengerProj/build.gradle | 2 +- .../src/main/java/com/b44t/messenger/MrMailbox.java | 7 +++++++ .../com/b44t/ui/Adapters/DrawerLayoutAdapter.java | 9 ++++++--- .../src/main/java/com/b44t/ui/LaunchActivity.java | 11 +++++++++++ MessengerProj/src/main/res/values-de/strings.xml | 2 ++ MessengerProj/src/main/res/values-es/strings.xml | 1 + MessengerProj/src/main/res/values-it/strings.xml | 1 + MessengerProj/src/main/res/values-nl/strings.xml | 1 + MessengerProj/src/main/res/values-pt/strings.xml | 1 + MessengerProj/src/main/res/values/strings.xml | 2 ++ 10 files changed, 33 insertions(+), 4 deletions(-) diff --git a/MessengerProj/build.gradle b/MessengerProj/build.gradle index 0ae14832e..009032ebb 100644 --- a/MessengerProj/build.gradle +++ b/MessengerProj/build.gradle @@ -129,7 +129,7 @@ android { defaultConfig { minSdkVersion 14 // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun) targetSdkVersion 23 - versionName "0.1.6" + versionName "0.1.7" } } diff --git a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java index 561731612..66a486cba 100644 --- a/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java +++ b/MessengerProj/src/main/java/com/b44t/messenger/MrMailbox.java @@ -290,4 +290,11 @@ public class MrMailbox { } }); } + + public static String getInviteText() { + String url = "https://getdelta.org"; + String email = getConfig("addr", ""); + String text = LocaleController.formatString("InviteText", R.string.InviteText, url, email); + return text; + } } diff --git a/MessengerProj/src/main/java/com/b44t/ui/Adapters/DrawerLayoutAdapter.java b/MessengerProj/src/main/java/com/b44t/ui/Adapters/DrawerLayoutAdapter.java index 57c73ef13..41da9eb14 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/Adapters/DrawerLayoutAdapter.java +++ b/MessengerProj/src/main/java/com/b44t/ui/Adapters/DrawerLayoutAdapter.java @@ -35,9 +35,10 @@ public class DrawerLayoutAdapter extends BaseAdapter { public final static int iNewGroup = 3; public final static int iDivider = 4; public final static int iSettings = 5; - public final static int iDeaddrop = 6; - public final static int iFaq = 7; - public final static int iCount = 8; + public final static int iInviteFriends = 6; + public final static int iDeaddrop = 7; + public final static int iFaq = 8; + public final static int iCount = 9; public final static int typeProfile = 0; public final static int typeEmpty = 1; @@ -103,6 +104,8 @@ public class DrawerLayoutAdapter extends BaseAdapter { actionCell.setTextAndIcon(LocaleController.getString("NewChat", R.string.NewChat), R.drawable.menu_newchat); } else if (i == iNewGroup) { actionCell.setTextAndIcon(LocaleController.getString("NewGroup", R.string.NewGroup), R.drawable.menu_empty); + } else if (i == iInviteFriends) { + actionCell.setTextAndIcon(LocaleController.getString("InviteFriends", R.string.InviteFriends), R.drawable.menu_empty); } else if (i == iDeaddrop) { actionCell.setTextAndIcon(LocaleController.getString("Deaddrop", R.string.Deaddrop), R.drawable.menu_empty); // we do not want an icon beside the mailbox: diff --git a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java index 1b12e119f..6c325a63e 100644 --- a/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java +++ b/MessengerProj/src/main/java/com/b44t/ui/LaunchActivity.java @@ -309,6 +309,17 @@ public class LaunchActivity extends Activity implements ActionBarLayout.ActionBa presentFragment(new ContactsActivity(args)); drawerLayoutContainer.closeDrawer(false); } + else if (position == DrawerLayoutAdapter.iInviteFriends) { + try { + Intent intent = new Intent(Intent.ACTION_SEND); + intent.setType("text/plain"); + intent.putExtra(Intent.EXTRA_TEXT, MrMailbox.getInviteText()); + startActivityForResult(Intent.createChooser(intent, LocaleController.getString("InviteFriends", R.string.InviteFriends)), 500); + } catch (Exception e) { + FileLog.e("tmessages", e); + } + drawerLayoutContainer.closeDrawer(false); + } else if (position == DrawerLayoutAdapter.iDeaddrop) { Bundle args = new Bundle(); args.putInt("chat_id", MrChat.MR_CHAT_ID_DEADDROP); diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml index 505a22cf6..2730ab000 100644 --- a/MessengerProj/src/main/res/values-de/strings.xml +++ b/MessengerProj/src/main/res/values-de/strings.xml @@ -693,4 +693,6 @@ Unten auf das Plussymbol für die erste Chatnachricht tippen; der Menüknopf öffnet die weiteren Opitonen. Kann Chat nicht löschen Konto konfigurieren... + Freunde einladen + Ich verwende nun auch den Delta Chat Messenger - %1$s - und bin dort unter %2$s erreichbar. diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml index 6010e500a..d65bf804d 100644 --- a/MessengerProj/src/main/res/values-es/strings.xml +++ b/MessengerProj/src/main/res/values-es/strings.xml @@ -623,4 +623,5 @@ Nuevo chat Multimedia Buscar + Invitar a amigos diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml index a05036c18..3ca4db2a2 100644 --- a/MessengerProj/src/main/res/values-it/strings.xml +++ b/MessengerProj/src/main/res/values-it/strings.xml @@ -623,4 +623,5 @@ Nuova chat Media Cerca + Invita amici diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml index 81aaf08a0..89ef70e8f 100644 --- a/MessengerProj/src/main/res/values-nl/strings.xml +++ b/MessengerProj/src/main/res/values-nl/strings.xml @@ -623,4 +623,5 @@ Nieuwe chat Media Zoeken + Vrienden uitnodigen diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml index fe1807f39..3736c6a35 100644 --- a/MessengerProj/src/main/res/values-pt/strings.xml +++ b/MessengerProj/src/main/res/values-pt/strings.xml @@ -623,4 +623,5 @@ Novo Chat Mídias Busca + Convidar Amigos diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml index 6ffe87deb..f48d80a40 100644 --- a/MessengerProj/src/main/res/values/strings.xml +++ b/MessengerProj/src/main/res/values/strings.xml @@ -694,4 +694,6 @@ Configuring account... Cannot connect, please check the configuration. Delta Chat]]> is safe for business use, compatible and standards-based. + Invite friends + I\'m using Delta Chat messenger now - %1$s - you can text me at %2$s