From 7fb4e5a1434ddf7449dbbff27393aec6982472ad Mon Sep 17 00:00:00 2001
From: Coffeemakr <l34k@bk.ru>
Date: Fri, 20 Jan 2017 18:54:15 +0100
Subject: [PATCH] Rename download db sqlite file

Rename the sqlite database to "downloads.db" instead of "newpipe.db"
to make sure the file will create a conflicts later.
---
 .../giga/get/sqlite/DownloadMissionSQLiteHelper.java      | 2 +-
 .../java/us/shandian/giga/ui/adapter/MissionAdapter.java  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
index 7b86f7dc4..6c29be474 100644
--- a/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
+++ b/app/src/main/java/us/shandian/giga/get/sqlite/DownloadMissionSQLiteHelper.java
@@ -17,7 +17,7 @@ public class DownloadMissionSQLiteHelper extends SQLiteOpenHelper {
     private final String TAG = "DownloadMissionHelper";
 
     // TODO: use NewPipeSQLiteHelper ('s constants) when playlist branch is merged (?)
-    private static final String DATABASE_NAME = "newpipe.db";
+    private static final String DATABASE_NAME = "downloads.db";
 
     private static final int DATABASE_VERSION = 2;
     /**
diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
index 094ddf3b3..5960c64fd 100644
--- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
+++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java
@@ -22,6 +22,7 @@ import android.support.v7.widget.RecyclerView;
 
 import java.io.File;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import org.schabi.newpipe.R;
@@ -150,9 +151,8 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 				h.status.setText(R.string.msg_error);
 			} else {
 				float progress = (float) h.mission.done / h.mission.length;
-				h.status.setText(String.format("%.2f%%", progress * 100));
+				h.status.setText(String.format(Locale.US, "%.2f%%", progress * 100));
 				h.progress.setProgress(progress);
-			
 			}
 		}
 		
@@ -315,7 +315,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 	static class ViewHolder extends RecyclerView.ViewHolder {
 		public DownloadMission mission;
 		public int position;
-		
+
 		public TextView status;
 		public ImageView icon;
 		public TextView name;
@@ -324,7 +324,7 @@ public class MissionAdapter extends RecyclerView.Adapter<MissionAdapter.ViewHold
 		public ImageView menu;
 		public ProgressDrawable progress;
 		public MissionObserver observer;
-		
+
 		public long lastTimeStamp = -1;
 		public long lastDone = -1;
 		public int colorId;