ImportExportHelper.getImportExportUrl: handle new URL

quentin-st · Aug 7, 2016 · 511c83e · 511c83e
1 parent 62e0aae
commit 511c83e
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/muninforAndroid/src/main/java/com/chteuchteu/munin/hlpr/ImportExportHelper.java b/muninforAndroid/src/main/java/com/chteuchteu/munin/hlpr/ImportExportHelper.java
@@ -61,7 +61,7 @@ private static String sendExportRequest(Context context, String jsonString, Impo
 					String error = jsonResult.getString("error");
 					Crashlytics.logException(new ImportExportWebserviceException("Error is " + error));
 				}
-				
+
 				return null;
 			} catch (JSONException e) {
 				e.printStackTrace();
@@ -278,11 +278,19 @@ private static void removeIdsFromGrids(List<String> currentGridNames, List<Grid>
 		}
 	}
 
+	/**
+	 * Returns import-export server URL.
+	 * If it matches one of the old URLs, return the new one
+	 * @param context Context
+	 * @return string
+     */
     public static String getImportExportServerUrl(Context context) {
-		String oldUrl = "http://www.munin-for-android.com/ws/importExport.php";
+		String oldUrl1 = "http://www.munin-for-android.com/ws/importExport.php";
+		String oldUrl2 = "http://ws.munin-for-android.com/importExport.php";
+
         String url = Settings.getInstance(context).getString(Settings.PrefKeys.ImportExportServer, IMPORT_EXPORT_URI);
 
-		return url.equals(oldUrl) ? IMPORT_EXPORT_URI : url;
+		return url.equals(oldUrl1) || url.equals(oldUrl2) ? IMPORT_EXPORT_URI : url;
     }
 
 	public static void showExportDialog(MuninFoo muninFoo, final Context context,