Fixes FS#158: user decision dialog heading configurable and translateable

3 files changed, 6 insertions, 12 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java
index 72d9d904..25349b2d 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/dialogs/UserDecisionDialog.java
@@ -11,20 +11,21 @@ import de.thedevstack.conversationsplus.ui.listeners.UserDecisionListener;
 import de.thedevstack.conversationsplus.R;
 
 /**
- * Created by tzur on 31.10.2015.
+ * A dialog to give the user the choice to decide whether to do something or not.
+ * The user also has the choice to save his answer for the future.
+ * A UserDecisionListener is used to provide the functionality to be performed by clicking on yes, or no.
  */
 public class UserDecisionDialog extends AbstractAlertDialog {
     protected final UserDecisionListener listener;
     protected final CheckBox rememberCheckBox;
 
     public UserDecisionDialog(Activity context, int questionResourceId, UserDecisionListener userDecisionListener) {
-        super(context, "User Decision");
+        super(context, questionResourceId);
         this.listener = userDecisionListener;
 
         int viewId = R.layout.dialog_userdecision;
         View view = context.getLayoutInflater().inflate(viewId, null);
 
-        ((TextView)view.findViewById(R.id.dlgUserDecQuestion)).setText(questionResourceId);
         this.rememberCheckBox = (CheckBox) view.findViewById(R.id.dlgUserDecRemember);
 
         this.setPositiveButton(R.string.cplus_yes, new PositiveOnClickListener());
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
index 1b4c7802..5ab8feb2 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
@@ -26,6 +26,7 @@ import de.thedevstack.conversationsplus.persistance.FileBackend;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.ui.XmppActivity;
+import de.thedevstack.conversationsplus.utils.StreamUtil;
 
 /**
  * Created by tzur on 31.10.2015.
@@ -146,7 +147,7 @@ public class ResizePictureUserDecisionListener implements UserDecisionListener {
             public void run() {
                 InputStream is = null;
                 try {
-                    is = ConversationsPlusApplication.getInstance().getContentResolver().openInputStream(uri);
+                    is = StreamUtil.openInputStreamFromContentResolver(uri);
                     long imageSize = is.available();
                     BitmapFactory.Options options = new BitmapFactory.Options();
                     options.inJustDecodeBounds = true;
diff --git a/src/main/res/layout/dialog_userdecision.xml b/src/main/res/layout/dialog_userdecision.xml
index 4c5a53cc..55f28a0b 100644
--- a/src/main/res/layout/dialog_userdecision.xml
+++ b/src/main/res/layout/dialog_userdecision.xml
@@ -4,14 +4,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Medium Text"
-        android:id="@+id/dlgUserDecQuestion"
-        android:layout_marginLeft="8dp" />
-
     <CheckBox
         android:layout_width="match_parent"
         android:layout_height="wrap_content"