integrate trust manager into conversations

1 files changed, 20 insertions, 16 deletions

diff --git a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java b/src/main/java/de/pixart/messenger/ui/MemorizingActivity.java
index 29b192093..8172e6f9c 100644
--- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MemorizingActivity.java
@@ -21,11 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package de.duenndns.ssl;
+package de.pixart.messenger.ui;
 
-
-import android.app.Activity;
-import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
@@ -33,15 +30,20 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-public class MemorizingActivity extends Activity
-        implements OnClickListener, OnCancelListener {
+import de.pixart.messenger.R;
+import de.pixart.messenger.entities.MTMDecision;
+import de.pixart.messenger.services.MemorizingTrustManager;
+
+public class MemorizingActivity extends AppCompatActivity implements OnClickListener,OnCancelListener {
 
-    public static final String THEME = "theme";
     private final static Logger LOGGER = Logger.getLogger(MemorizingActivity.class.getName());
+
     int decisionId;
 
     AlertDialog dialog;
@@ -49,7 +51,7 @@ public class MemorizingActivity extends Activity
     @Override
     public void onCreate(Bundle savedInstanceState) {
         LOGGER.log(Level.FINE, "onCreate");
-//        setTheme(findTheme());
+        //setTheme(findTheme());
         super.onCreate(savedInstanceState);
     }
 
@@ -63,9 +65,9 @@ public class MemorizingActivity extends Activity
         LOGGER.log(Level.FINE, "onResume with " + i.getExtras() + " decId=" + decisionId + " data: " + i.getData());
         dialog = new AlertDialog.Builder(this).setTitle(titleId)
                 .setMessage(cert)
-                .setPositiveButton(R.string.mtm_decision_always, this)
-                .setNeutralButton(R.string.mtm_decision_once, this)
-                .setNegativeButton(R.string.mtm_decision_abort, this)
+                .setPositiveButton(R.string.always, this)
+                .setNeutralButton(R.string.once, this)
+                .setNegativeButton(R.string.cancel, this)
                 .setOnCancelListener(this)
                 .create();
         dialog.show();
@@ -84,12 +86,14 @@ public class MemorizingActivity extends Activity
         finish();
     }
 
-//    protected int findTheme() {
-//        return getPreferences().getString(THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
-//    }
+    protected int findTheme() {
+        return 0;
+        //return getPreferences().getString(SettingsActivity.THEME, getResources().getString(R.string.theme)).equals("dark") ? R.style.ConversationsTheme_Dark : R.style.ConversationsTheme;
+    }
 
     protected SharedPreferences getPreferences() {
-        return PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        return PreferenceManager
+                .getDefaultSharedPreferences(getApplicationContext());
     }
 
     // react on AlertDialog button press
@@ -112,4 +116,4 @@ public class MemorizingActivity extends Activity
     public void onCancel(DialogInterface dialog) {
         sendDecision(MTMDecision.DECISION_ABORT);
     }
-}
+}
\ No newline at end of file