diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index adbb095375d482d9d629ce8949e55a71629c9207..a275707049a5aca0b0b01cf287d03800ce6e6667 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -3,8 +3,10 @@ package eu.siacs.conversations.ui; import android.annotation.TargetApi; import android.app.AlertDialog; import android.app.PendingIntent; +import android.content.ActivityNotFoundException; import android.content.Context; import android.content.DialogInterface; +import android.content.Intent; import android.content.IntentSender.SendIntentException; import android.os.Build; import android.os.Bundle; @@ -281,6 +283,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers quickEdit(mConversation.getName(),this.onSubjectEdited); } break; + case R.id.action_share: + share(); + break; case R.id.action_save_as_bookmark: saveAsBookmark(); break; @@ -308,6 +313,18 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers } } + private void share() { + Intent shareIntent = new Intent(); + shareIntent.setAction(Intent.ACTION_SEND); + shareIntent.putExtra(Intent.EXTRA_TEXT, getShareableUri()); + shareIntent.setType("text/plain"); + try { + startActivity(Intent.createChooser(shareIntent, getText(R.string.share_uri_with))); + } catch (ActivityNotFoundException e) { + Toast.makeText(this, R.string.no_application_to_share_uri, Toast.LENGTH_SHORT).show(); + } + } + @Override public boolean onPrepareOptionsMenu(Menu menu) { MenuItem menuItemSaveBookmark = menu.findItem(R.id.action_save_as_bookmark); diff --git a/src/main/res/drawable-hdpi/ic_action_share.png b/src/main/res/drawable-hdpi/ic_action_share.png new file mode 100644 index 0000000000000000000000000000000000000000..a36464b8be84a614d4028bc961946d97dd034153 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_action_share.png differ diff --git a/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/src/main/res/drawable-hdpi/ic_share_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..93b3c219c61edca29f27448b44abcadd19d150f5 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_share_white_24dp.png differ diff --git a/src/main/res/drawable-mdpi/ic_action_share.png b/src/main/res/drawable-mdpi/ic_action_share.png new file mode 100644 index 0000000000000000000000000000000000000000..7362f0d7b0feeaf36ad4fe0c3786318dff2c3bfe Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_action_share.png differ diff --git a/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/src/main/res/drawable-mdpi/ic_share_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..4d01972233f0368a60ae8bf0c41d6b09246ab81a Binary files /dev/null and b/src/main/res/drawable-mdpi/ic_share_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_share.png b/src/main/res/drawable-xhdpi/ic_action_share.png new file mode 100644 index 0000000000000000000000000000000000000000..40771e480181cbf5144668d273b6b3dd4bc7d1dd Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_action_share.png differ diff --git a/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/src/main/res/drawable-xhdpi/ic_share_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dd536bca2db25dbc5ac58808858f540db25b2901 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_share_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_share.png b/src/main/res/drawable-xxhdpi/ic_action_share.png new file mode 100644 index 0000000000000000000000000000000000000000..22ed428fc3d954710cc108d996a6eb3debadeea1 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_action_share.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..9963c6a056186240454290d419181c9bc3ddbbd8 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png differ diff --git a/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bb521c141bfc1d6ca7aba0f34ab4638f86b0bbe0 Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/ic_share_white_24dp.png differ diff --git a/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml index 51de4e753a2c31f64073b8e65db5d9f86b82ce90..ad79f5778216c28bcd3edf2c5dcfdb2f3c256b71 100644 --- a/src/main/res/menu/muc_details.xml +++ b/src/main/res/menu/muc_details.xml @@ -1,5 +1,5 @@ - + + + + android:showAsAction="never" + android:title="@string/show_qr_code"/> + android:showAsAction="never" + android:title="@string/save_as_bookmark"/> - + android:showAsAction="never" + android:title="@string/delete_bookmark"/> + @drawable/ic_lock_open_white_24dp @drawable/ic_settings_grey600_24dp @drawable/ic_import_export_white_24dp + @drawable/ic_share_white_24dp diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index d471e54ac812b9f83d024f226986a24d5d26833b..901ea7547113448ac31d24a9429c8ffac1d18601 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -24,6 +24,7 @@ + \ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index e9e9973051252f023a1a59eed63597a91cffb3bd..97ba18afc343b70475ab46e0b42b44ad32cbc5f9 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -612,4 +612,6 @@ Select image and crop You have disabled this account Security error: Invalid file access + No application found to share URI + Share URI with… diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 0f8b95bb1123369a9f7aeeae027e6d2d79866adf..424db4c92a860a506eff05bb20913f241de098ab 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -30,6 +30,7 @@ @drawable/ic_action_secure @drawable/ic_action_settings @drawable/ic_stat_communication_import_export + @drawable/ic_action_share