commit dca09ac065410068053a5f827d9da280418d73d1
author Jose Pascoal <jose.pascoal@kwamecorp.com> Wed Mar 11 16:35:06 2015 +0000
committer Jose Pascoal <jose.pascoal@kwamecorp.com> Wed Mar 11 16:35:06 2015 +0000
tree d8dca0b729192cf877e520ce74d1d476c4f89950
parent 1216b10608ec68524a239594f994e3f668bd3fd9

- Show the default url as a hint on the edit box

res/layout/fragment_main.xml

diff --git a/res/layout/fragment_main.xml b/res/layout/fragment_main.xml
index 5355b9e..c0ee9a3 100644
--- a/res/layout/fragment_main.xml
+++ b/res/layout/fragment_main.xml
@@ -14,7 +14,8 @@
             android:id="@+id/dev_mode_url_edit_text"
             android:layout_width="0dp"
             android:layout_weight="5"
-            android:layout_height="wrap_content"/>
+            android:layout_height="wrap_content"
+            android:hint="@string/downloadUrl"/>
 
         <Button
             android:id="@+id/dev_mode_url_ok_button"

src/com/fairphone/updater/FairphoneUpdater.java

diff --git a/src/com/fairphone/updater/FairphoneUpdater.java b/src/com/fairphone/updater/FairphoneUpdater.java
index d54560a..99cf36b 100644
--- a/src/com/fairphone/updater/FairphoneUpdater.java
+++ b/src/com/fairphone/updater/FairphoneUpdater.java
@@ -232,12 +232,10 @@
     }
 
     public void changeOTADownloadURL(String newUrl){
+        mOtaDownloadUrl = TextUtils.isEmpty(newUrl) ? getResources().getString(R.string.downloadUrl) : newUrl;
+
         Editor editor = mSharedPreferences.edit();
-
-        mOtaDownloadUrl = newUrl;
-
-        editor.putString(PREFERENCE_OTA_DOWNLOAD_URL, newUrl);
-
+        editor.putString(PREFERENCE_OTA_DOWNLOAD_URL, mOtaDownloadUrl);
         editor.commit();
     }
 

src/com/fairphone/updater/fragments/MainFragment.java

diff --git a/src/com/fairphone/updater/fragments/MainFragment.java b/src/com/fairphone/updater/fragments/MainFragment.java
index 6d38db2..903e432 100644
--- a/src/com/fairphone/updater/fragments/MainFragment.java
+++ b/src/com/fairphone/updater/fragments/MainFragment.java
@@ -110,7 +110,7 @@
                 // set the URL for the shared prefs
                 mainActivity.changeOTADownloadURL(url);
 
-                // download new code
+                // download new config
                 mainActivity.forceConfiDownload();
             }
         });