Moved Notify class to utils

2 files changed, 1 insertions, 71 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
index f0bdabe93..7fdab7bdd 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
@@ -39,7 +39,7 @@ import org.sufficientlysecure.keychain.helper.FileHelper;
 import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyResult;
 import org.sufficientlysecure.keychain.service.KeychainIntentService;
 import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler;
-import org.sufficientlysecure.keychain.ui.adapter.Notify;
+import org.sufficientlysecure.keychain.util.Notify;
 import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.FileDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/Notify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/Notify.java
deleted file mode 100644
index 5b8979235..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/Notify.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2011 Senecaso
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.sufficientlysecure.keychain.ui.adapter;
-
-import android.app.Activity;
-import android.content.res.Resources;
-
-import com.github.johnpersano.supertoasts.SuperCardToast;
-import com.github.johnpersano.supertoasts.SuperToast;
-
-/**
- * @author danielhass
- * Notify wrapper which allows a more easy use of different notification libraries
- */
-public class Notify {
-
-    public static enum Style {OK, WARN, ERROR}
-
-    /**
-     * Shows a simple in-layout notification with the CharSequence given as parameter
-     * @param activity
-     * @param text     Text to show
-     * @param style    Notification styling
-     */
-    public static void showNotify(Activity activity, CharSequence text, Style style) {
-
-        SuperCardToast st = new SuperCardToast(activity);
-        st.setText(text);
-        st.setDuration(SuperToast.Duration.MEDIUM);
-        switch (style){
-            case OK:
-                st.setBackground(SuperToast.Background.GREEN);
-                break;
-            case WARN:
-                st.setBackground(SuperToast.Background.ORANGE);
-                break;
-            case ERROR:
-                st.setBackground(SuperToast.Background.RED);
-                break;
-        }
-        st.show();
-
-    }
-
-    /**
-     * Shows a simple in-layout notification with the resource text from given id
-     * @param activity
-     * @param resId    ResourceId of notification text
-     * @param style    Notification styling
-     * @throws Resources.NotFoundException
-     */
-    public static void showNotify(Activity activity, int resId, Style style) throws Resources.NotFoundException {
-        showNotify(activity, activity.getResources().getText(resId), style);
-    }
-}
\ No newline at end of file