diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
index 333bb02..8027d98 100644
--- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
+++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java
@@ -28,7 +28,7 @@
 
 //-----------------------------------------------------------------
 // 描画キャンバスの本体
-public class PaintCanvas extends View  {
+public class PaintCanvas extends View {
 
     private Path path;
     private Path clonepath;
@@ -36,10 +36,10 @@
     private Paint paint;
     private Paint clonepaint;
     private Paint latestpaint;
-    private ArrayList<Paint> paints= new ArrayList<>();
-    private ArrayList<Path> paths= new ArrayList<>();
-    private ArrayList<Paint> clonepaints= new ArrayList<>();
-    private ArrayList<Path> clonepaths= new ArrayList<>();
+    private ArrayList<Paint> paints = new ArrayList<>();
+    private ArrayList<Path> paths = new ArrayList<>();
+    private ArrayList<Paint> clonepaints = new ArrayList<>();
+    private ArrayList<Path> clonepaths = new ArrayList<>();
     private PaintViewModel paintViewModel;
     private ScheduledThreadPoolExecutor thread = new ScheduledThreadPoolExecutor(1);
     private Canvas curCanvas;
@@ -56,7 +56,7 @@
     public PaintCanvas(Context context, @Nullable AttributeSet attrs) {
         super(context, attrs);
 
-        pen = new Pen(255,0,0,0,20);
+        pen = new Pen(255, 0, 0, 0, 20);
         //pen =new Pen(Color.BLACK,20);//新しくPenクラスを作り色と幅の値を設定
         path = new Path(); // 図形描画
         paths.add(path);
@@ -68,7 +68,7 @@
         ///
         clonepaint = new Paint();//筆の種類
         latestpaint = new Paint();//筆の種類
-        paint.setColor(Color.argb(pen.getAlpha(),pen.getRed(),pen.getGreen(),pen.getBlue()));//色の指定
+        paint.setColor(Color.argb(pen.getAlpha(), pen.getRed(), pen.getGreen(), pen.getBlue()));//色の指定
         paint.setStyle(Paint.Style.STROKE);//線をひく
         paint.setStrokeWidth(pen.getThickness());//幅
         clonepaint.setColor(Color.RED);//色の指定
@@ -90,7 +90,9 @@
         return curCanvas;
     }
 
-    public Pen getPen(){return pen;}
+    public Pen getPen() {
+        return pen;
+    }
 
     //-----------------------------------------------------------------
     // setter
@@ -105,21 +107,25 @@
     protected void onDraw(Canvas canvas) {
         super.onDraw(curCanvas);
         canvas.drawColor(0xFFFFFFFF);
-        paint.setColor(Color.argb(pen.getAlpha(),pen.getRed(),pen.getGreen(),pen.getBlue()));
+        paint.setColor(Color.argb(pen.getAlpha(), pen.getRed(), pen.getGreen(), pen.getBlue()));
         paint.setStrokeWidth(pen.getThickness());
-        for(int i=0; i< paths.toArray().length ; i++){
-            if(paths.toArray().length<i){
+        for (int i = 0; i < clonepaths.toArray().length; i++) {
+            try {
                 canvas.drawPath(paths.get(i), paints.get(i));
                 curCanvas.drawPath(paths.get(i), paints.get(i));
+            } catch (IndexOutOfBoundsException ex) {
+
             }
-            if(clonepaths.toArray().length<i){
+            try {
                 canvas.drawPath(clonepaths.get(i), clonepaints.get(i));
                 curCanvas.drawPath(clonepaths.get(i), clonepaints.get(i));
+            } catch (IndexOutOfBoundsException ex) {
+
             }
         }
-        //canvas.drawPath(clonepath, clonepaint);
-        //curCanvas.drawPath(clonepath, clonepaint);
     }
+    //canvas.drawPath(clonepath, clonepaint);
+    //curCanvas.drawPath(clonepath, clonepaint);
 
     //-----------------------------------------------------------------
     // 描画操作 (条件分岐：押したとき、動かしたとき、放した時）
@@ -135,7 +141,7 @@
                 Log.d("motion", "+++++++++++++++++++++++++++++++++++++++down======================================================");
                 onTouched(x, y);
                 paintViewModel.setmStrokeNo();
-                paintViewModel.addLocalStrokeRequest(x, y,Color.argb(pen.getAlpha(),pen.getRed(),pen.getGreen(),pen.getBlue()),pen.getThickness());
+                paintViewModel.addLocalStrokeRequest(x, y, Color.argb(pen.getAlpha(), pen.getRed(), pen.getGreen(), pen.getBlue()), pen.getThickness());
                 //paintViewModel.addPositionLocal(x, y);
                 break;
 
@@ -150,7 +156,7 @@
                 paintViewModel.addPositionRequestFirst();
                 path = new Path();
                 paint = new Paint();
-                paint.setColor(Color.argb(pen.getAlpha(),pen.getRed(),pen.getGreen(),pen.getBlue()));//色の指定
+                paint.setColor(Color.argb(pen.getAlpha(), pen.getRed(), pen.getGreen(), pen.getBlue()));//色の指定
                 paint.setStyle(Paint.Style.STROKE);//線をひく
                 paths.add(path);
                 paints.add(paint);
@@ -165,7 +171,7 @@
     // 描画クリア
     public void clearCanvas() {
         //paintViewModel.deleteStrokesRequest();
-        for(int i=0; i< paths.toArray().length ; i++){
+        for (int i = 0; i < paths.toArray().length; i++) {
             paths.get(i).reset();
             //paints.clear();
         }
@@ -230,31 +236,33 @@
         String encode = Base64.getEncoder().encodeToString(byteArray);
         Log.d("motion", "=====================================up======================================================");
         Log.d("motion", "=====================================up======================================================");
-        int stringcnt=0;
-        int last=0;
-        for(int i = 0; i<encode.length()/4000; i++){
-            Log.d("encode:", encode.substring(i*4000,(i+1)*4000));
+        int stringcnt = 0;
+        int last = 0;
+        for (int i = 0; i < encode.length() / 4000; i++) {
+            Log.d("encode:", encode.substring(i * 4000, (i + 1) * 4000));
             stringcnt++;
         }
-        Log.d("encode:", encode.substring(4000*stringcnt,encode.length()));
+        Log.d("encode:", encode.substring(4000 * stringcnt, encode.length()));
         image.recycle();
         ResetImage();
     }
-//imageの変数をリセット
-    protected void ResetImage(){
+
+    //imageの変数をリセット
+    protected void ResetImage() {
         super.onSizeChanged(curw, curh, curoldw, curoldh);
         image = Bitmap.createBitmap(curw, curh, Bitmap.Config.ARGB_8888);
         curCanvas = new Canvas(image);
         curCanvas.drawColor(0xFFFFFFFF);
     }
+
     //imageの変数を初期化
     //SSする度に実行
     @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh){
-        curw=w;
-        curh=h;
-        curoldw=oldw;
-        curoldh=oldh;
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        curw = w;
+        curh = h;
+        curoldw = oldw;
+        curoldh = oldh;
         super.onSizeChanged(w, h, oldw, oldh);
         image = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888);
         curCanvas = new Canvas(image);
@@ -270,7 +278,7 @@
         for (Stroke s : paintViewModel.getStroke().getValue()) {
             clonepaint = new Paint();
             clonepath = new Path();
-            clonepaint.setColor(Color.argb(Color.alpha(s.getColor()),Color.red(s.getColor()),Color.green(s.getColor()),Color.blue(s.getColor())));//色の指定
+            clonepaint.setColor(Color.argb(Color.alpha(s.getColor()), Color.red(s.getColor()), Color.green(s.getColor()), Color.blue(s.getColor())));//色の指定
             clonepaint.setStrokeWidth(s.getThickness());
             clonepaint.setStyle(Paint.Style.STROKE);//線をひく
             clonepaints.add(clonepaint);