aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/services/NotificationService.java4
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java3
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationsActivity.java7
-rw-r--r--src/main/res/menu/activity_conversations.xml4
4 files changed, 0 insertions, 18 deletions
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index 939c95299..af205dbe6 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -1048,10 +1048,6 @@ public class NotificationService {
return mBuilder.build();
}
- public void AppUpdateServiceNotification(Notification notification) {
- notify(FOREGROUND_NOTIFICATION_ID, notification);
- }
-
private void notify(String tag, int id, Notification notification) {
final NotificationManagerCompat notificationManager = NotificationManagerCompat.from(mXmppConnectionService);
try {
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 5e24ecb2c..ac5604963 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1095,7 +1095,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
boolean hasAttachments = mediaPreviewAdapter != null && mediaPreviewAdapter.hasAttachments();
menuInflater.inflate(R.menu.fragment_conversation, menu);
final MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
- final MenuItem menuSearchUpdates = menu.findItem(R.id.action_check_updates);
final MenuItem menuArchiveChat = menu.findItem(R.id.action_archive_chat);
final MenuItem menuGroupDetails = menu.findItem(R.id.action_group_details);
final MenuItem menuContactDetails = menu.findItem(R.id.action_contact_details);
@@ -1124,11 +1123,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
menuContactDetails.setVisible(false);
}
menuMediaBrowser.setVisible(true);
- menuSearchUpdates.setVisible(false);
ConversationMenuConfigurator.configureAttachmentMenu(conversation, menu, activity.xmppConnectionService.getAttachmentChoicePreference(), hasAttachments);
ConversationMenuConfigurator.configureEncryptionMenu(conversation, menu);
} else {
- menuSearchUpdates.setVisible(true);
menuInviteContact.setVisible(false);
menuGroupDetails.setVisible(false);
menuContactDetails.setVisible(false);
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
index 56d347f1c..88a3b2509 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsActivity.java
@@ -565,13 +565,6 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
case R.id.action_scan_qr_code:
UriHandlerActivity.scan(this);
return true;
- case R.id.action_check_updates:
- if (xmppConnectionService.hasInternetConnection()) {
- openInstallFromUnknownSourcesDialogIfNeeded(true);
- } else {
- Toast.makeText(this, R.string.account_status_no_internet, Toast.LENGTH_LONG).show();
- }
- break;
case R.id.action_invite_user:
inviteUser();
break;
diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml
index 4f19bcbdd..aa25cea66 100644
--- a/src/main/res/menu/activity_conversations.xml
+++ b/src/main/res/menu/activity_conversations.xml
@@ -19,10 +19,6 @@
android:title="@string/action_settings"
app:showAsAction="never" />
<item
- android:id="@+id/action_check_updates"
- android:title="@string/action_check_update"
- app:showAsAction="never" />
- <item
android:id="@+id/action_invite_user"
android:orderInCategory="100"
android:title="@string/invite_user"