OSM User Name Dialog & Storing in sharedPreferences #111

Author: hallahan

app/src/main/java/org/redcross/openmapkit/odkcollect/ODKCollectData.java

@@ -134,10 +134,10 @@ public String getTagValueLabel(String key, String value) {
         return null;
     }
 
-    public void consumeOSMElement(OSMElement el) throws IOException {
+    public void consumeOSMElement(OSMElement el, String osmUserName) throws IOException {
         osmClassName = el.getClass().getSimpleName();
         osmId = el.getId();
-        editedXml = OSMXmlWriter.elementToString(el, "theoutpost", APP_NAME + " " + appVersion);
+        editedXml = OSMXmlWriter.elementToString(el, osmUserName, APP_NAME + " " + appVersion);
     }
 
     public void deleteOldOSMEdit() {

app/src/main/java/org/redcross/openmapkit/odkcollect/ODKCollectHandler.java

@@ -70,9 +70,9 @@ public static ODKCollectData getODKCollectData() {
      * @param el
      * @return The full path of the saved OSM XML File
      */
-    public static String saveXmlInODKCollect(OSMElement el) {
+    public static String saveXmlInODKCollect(OSMElement el, String osmUserName) {
         try {
-            odkCollectData.consumeOSMElement(el);
+            odkCollectData.consumeOSMElement(el, osmUserName);
             odkCollectData.deleteOldOSMEdit();
             odkCollectData.writeXmlToOdkCollectInstanceDir();
             return odkCollectData.getOSMFileFullPath();

app/src/main/java/org/redcross/openmapkit/odkcollect/ODKCollectTagActivity.java

@@ -68,12 +68,12 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     void saveToOdkCollect() {
-        OSMElement osmElement = fragment.updateTagsInOSMElement();
-        String osmXmlFileFullPath = ODKCollectHandler.saveXmlInODKCollect(osmElement);
-        
-        Intent resultIntent = new Intent();
-        resultIntent.putExtra("OSM_PATH", osmXmlFileFullPath);
-        setResult(Activity.RESULT_OK, resultIntent);
+//        OSMElement osmElement = fragment.updateTagsInOSMElement();
+//        String osmXmlFileFullPath = ODKCollectHandler.saveXmlInODKCollect(osmElement);
+//
+//        Intent resultIntent = new Intent();
+//        resultIntent.putExtra("OSM_PATH", osmXmlFileFullPath);
+//        setResult(Activity.RESULT_OK, resultIntent);
 
         finish();
     }

app/src/main/java/org/redcross/openmapkit/tagswipe/TagEdit.java

@@ -94,9 +94,9 @@ public static int getIndexForTagKey(String key) {
         return 0;
     }
 
-    public static void saveToODKCollect() {
+    public static void saveToODKCollect(String osmUserName) {
         updateTagsInOSMElement();
-        ODKCollectHandler.saveXmlInODKCollect(osmElement);
+        ODKCollectHandler.saveXmlInODKCollect(osmElement, osmUserName);
     }
 
     private static void updateTagsInOSMElement() {

app/src/main/java/org/redcross/openmapkit/tagswipe/TagSwipeActivity.java

@@ -6,13 +6,17 @@
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Context;
+import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
+import android.support.v7.app.AlertDialog;
+import android.text.InputType;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
@@ -24,10 +28,12 @@
 public class TagSwipeActivity extends ActionBarActivity {
 
     private List<TagEdit> tagEdits;
+    private SharedPreferences userNamePref;
 
 
     private void setupModel() {
         tagEdits = TagEdit.buildTagEdits();
+        userNamePref = getSharedPreferences("org.redcross.openmapkit.USER_NAME", Context.MODE_PRIVATE);
     }
 
 
@@ -93,17 +99,49 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
+    /**
+     * We check to see if there is a saved user name. If there is not,
+     * we present a dialog to ask for it. Otherwise, we just use what
+     * is saved for writing OSM XML and saving to ODK Collect.
+     */
     public void saveToODKCollect() {
-        TagEdit.saveToODKCollect();
-        setResult(Activity.RESULT_OK);
-        finish();
+        String userName = userNamePref.getString("userName", null);
+        if (userName == null) {
+            askForOSMUsername();
+        } else {
+            TagEdit.saveToODKCollect(userName);
+            setResult(Activity.RESULT_OK);
+            finish();
+        }
     }
 
     public void cancel() {
         setResult(Activity.RESULT_CANCELED);
         finish();
     }
-    
+
+    private void askForOSMUsername() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        builder.setTitle("OpenStreetMap User Name");
+        builder.setMessage("Please enter your OpenStreetMap user name.");
+        final EditText input = new EditText(this);
+        input.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+        builder.setView(input);
+        builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                String userName = input.getText().toString();
+                SharedPreferences.Editor editor = userNamePref.edit();
+                editor.putString("userName", userName);
+                editor.apply();
+                TagEdit.saveToODKCollect(userName);
+                setResult(Activity.RESULT_OK);
+                finish();
+            }
+        });
+        builder.show();
+    }
+
     /**
      * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
      * one of the sections/tabs/pages.