From f81fbb36f1f2fc9181e7ec6a1397d1674529649d Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 16 Feb 2018 13:29:38 +0100 Subject: [PATCH] migrated alert dialogs to app compat --- .../java/eu/siacs/conversations/ui/BlockContactDialog.java | 2 +- .../eu/siacs/conversations/ui/ConferenceDetailsActivity.java | 2 +- .../eu/siacs/conversations/ui/ContactDetailsActivity.java | 2 +- .../java/eu/siacs/conversations/ui/ConversationActivity.java | 2 +- .../java/eu/siacs/conversations/ui/ConversationFragment.java | 2 +- .../java/eu/siacs/conversations/ui/EditAccountActivity.java | 4 ++-- src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java | 2 +- .../java/eu/siacs/conversations/ui/ManageAccountActivity.java | 2 +- src/main/java/eu/siacs/conversations/ui/OmemoActivity.java | 2 +- src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | 2 +- .../eu/siacs/conversations/ui/StartConversationActivity.java | 2 +- .../java/eu/siacs/conversations/ui/VerifyOTRActivity.java | 2 +- src/main/java/eu/siacs/conversations/ui/XmppActivity.java | 4 ++-- .../java/eu/siacs/conversations/utils/ExceptionHelper.java | 2 +- .../eu/siacs/conversations/utils/zxing/IntentIntegrator.java | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java index 4db77cef4bab9565c733b3a702da1d540f3d05bd..dd6360674932ae691712ad882bfe8b9e92e569a2 100644 --- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.text.SpannableString; diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java index 95dcd624051dc39907a4d6a04e4ea74dcfdcfa26..d555ac0e96451c2ad29f7a38704793befa914713 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.PendingIntent; import android.content.Context; import android.content.DialogInterface; diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index 19fcdff45fa8f75f1da2af7b14e5f27b06b7d813..f00a6e8392fcd88e2f15254c6a6dfc529270f831 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 20b2ca274a822fcbe50e16612894d16dd5580cae..06f69caf83d4352f6d06a794bc4f609677a58868 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui; import android.annotation.SuppressLint; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.FragmentTransaction; import android.app.PendingIntent; import android.content.ActivityNotFoundException; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index b668ee8e486ac9d64252efe8c3c1f4b24efb7c65..ac5e5d8a5afffd065dd5a4cae555a08f5765075d 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui; import android.app.Activity; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.Fragment; import android.app.PendingIntent; import android.content.ActivityNotFoundException; diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java index e1dd9c517eee43a0c336dbffef06f0548c5ac6ea..2cbb26c28fd6b3984aedf06bf267d1649e1172a6 100644 --- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java @@ -1,7 +1,7 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; -import android.app.AlertDialog.Builder; +import android.support.v7.app.AlertDialog; +import android.support.v7.app.AlertDialog.Builder; import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.DialogInterface; diff --git a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java index 261f93b0b874abccdd13188690a43bfe67a14eec..5913dad17a604bc10d6706746b2c5351d2742dc0 100644 --- a/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java +++ b/src/main/java/eu/siacs/conversations/ui/EnterJidDialog.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.Dialog; import android.content.Context; import android.view.LayoutInflater; diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java index cd42e7c1c2468793ba0b3a996f13ece4ec2c4795..86b1b4c710099e1f45c7ec2cdcbc72cf15190021 100644 --- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.content.ActivityNotFoundException; import android.content.Intent; import android.os.Bundle; diff --git a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java index 34043ade172b7141b1e9cc11ea2a93d8f4b2a3b8..dab079089116b370d7642b9d4ca235c390f0fa04 100644 --- a/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/OmemoActivity.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index d8c9b7675d4dcfa62754a832383510356a5dc01c..3b68fbc6bbb18206ff0f40ddab5bf9cdd86eb0c1 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.FragmentManager; import android.content.DialogInterface; import android.content.Intent; diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index a9350f277b451eb02206f938272f8b3480207771..98b227afcb8691edb7234a85a463601dd1d12c66 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -2,7 +2,7 @@ package eu.siacs.conversations.ui; import android.Manifest; import android.annotation.SuppressLint; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.Dialog; import android.app.PendingIntent; import android.content.ActivityNotFoundException; diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java index 5633fcb94959ec7f63b3f85ce2de70786c2b9ced..00d96994ecc0f7f86a8a3c58ee3e0e7324d4c191 100644 --- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.ui; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java index 2705d89ceb818082154cd211f78e40ff7efef56c..593189195daf6f16b55c5c204675530470342e71 100644 --- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java @@ -3,8 +3,8 @@ package eu.siacs.conversations.ui; import android.Manifest; import android.annotation.SuppressLint; import android.annotation.TargetApi; -import android.app.AlertDialog; -import android.app.AlertDialog.Builder; +import android.support.v7.app.AlertDialog; +import android.support.v7.app.AlertDialog.Builder; import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.ClipData; diff --git a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java index a9a8688b182053a7af4757a8455d115996843abd..0bbbb7e37ce261e79044695c5c72cb7871a15265 100644 --- a/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java @@ -1,6 +1,6 @@ package eu.siacs.conversations.utils; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.DialogInterface.OnClickListener; diff --git a/src/main/java/eu/siacs/conversations/utils/zxing/IntentIntegrator.java b/src/main/java/eu/siacs/conversations/utils/zxing/IntentIntegrator.java index 2aaadeb41c3be52f26776676a67d478bbf584038..a615569d83e92cacd26d551fc9202e4a5c56934c 100644 --- a/src/main/java/eu/siacs/conversations/utils/zxing/IntentIntegrator.java +++ b/src/main/java/eu/siacs/conversations/utils/zxing/IntentIntegrator.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.Map; import android.app.Activity; -import android.app.AlertDialog; +import android.support.v7.app.AlertDialog; import android.app.Fragment; import android.content.ActivityNotFoundException; import android.content.DialogInterface;