/ - Diff - Magic Cube - Distorted Android

     import org.distorted.main.R;
     import org.distorted.external.RubikNetwork;
     import org.distorted.external.RubikUpdates;
     import org.distorted.objects.RubikObjectList;
     import java.io.IOException;
     import java.lang.ref.WeakReference;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
       private Button mButton;
       private TextView mDescription;
       private WeakReference<Activity> mAct;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public View createView(Activity act, RubikUpdates.UpdateInfo info, int fontSize, int padding,
                              LinearLayout.LayoutParams pView, LinearLayout.LayoutParams pText, LinearLayout.LayoutParams pButt )
+        {
         mAct = new WeakReference<>(act);
         mInfo = info;
         final RubikNetwork.Downloadee downloadee = this;
         View view = act.getLayoutInflater().inflate(R.layout.dialog_updates_pane, null);
-...
           mDescription.setText(R.string.installing);
           RubikFiles files = RubikFiles.getInstance();
           boolean oSuccess=true, eSuccess=true;
           boolean iSuccess=true,oSuccess=true, eSuccess=true;
           if( mInfo.mIcon!=null )
+            {
             String name = mInfo.mObjectShortName + ".png";
             Activity act = mAct.get();
             iSuccess = files.saveFile(act,mInfo.mIcon, name);
+            }
           if( mInfo.mObjectStream!=null )
+            {
             String name = mInfo.mObjectShortName + "_object.json";
             oSuccess = files.saveFile(mInfo.mObjectStream, name);
             Activity act = mAct.get();
             oSuccess = files.saveFile(act,mInfo.mObjectStream, name);
+            }
           if( mInfo.mExtrasStream!=null )
+            {
             String name = mInfo.mObjectShortName + "_extras.json";
             eSuccess = files.saveFile(mInfo.mExtrasStream, name);
             Activity act = mAct.get();
             eSuccess = files.saveFile(act,mInfo.mExtrasStream, name);
+            }
           if( oSuccess )
           if( iSuccess && oSuccess )
+            {
             mBar.setProgress(75);
             mDescription.setText(R.string.configuring);
             RubikObjectList.addDownloadedObject(mInfo.mObjectShortName,iSuccess,oSuccess,eSuccess);
             mBar.setProgress(100);
             mDescription.setText(R.string.success);
             RubikNetwork network = RubikNetwork.getInstance();
             network.updateDone(mInfo.mObjectShortName);
+            }
           else
+            {

     package org.distorted.external;
     import java.io.File;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.io.OutputStream;
     import android.content.Context;
     import android.graphics.Bitmap;
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public class RubikFiles
+      {
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public boolean saveFile(InputStream stream, String name)
       public boolean saveFile(Context context, InputStream stream, String name)
+        {
         return false;
         try
+          {
           File file = new File(context.getFilesDir(), name);
           OutputStream outStream = new FileOutputStream(file);
           byte[] buffer = new byte[8*1024];
           int bytesRead;
           while ((bytesRead = stream.read(buffer)) != -1)
+            {
             outStream.write(buffer, 0, bytesRead);
+            }
           outStream.close();
           return true;
+          }
         catch(IOException ioe)
+          {
           android.util.Log.e("D", "Exception trying to save "+name+" : "+ioe.getMessage() );
           return false;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public boolean saveFile(Context context, Bitmap bmp, String name)
+        {
         try
+          {
           File file = new File(context.getFilesDir(), name);
           OutputStream outStream = new FileOutputStream(file);
           bmp.compress(Bitmap.CompressFormat.PNG, 100, outStream);
           outStream.close();
           return true;
+          }
         catch(IOException ioe)
+          {
           android.util.Log.e("D", "Exception trying to save "+name+" : "+ioe.getMessage() );
           return false;
+          }
+        }
+      }

           HttpURLConnection conn = (HttpURLConnection) connectURL.openConnection();
           conn.setDoInput(true);
           conn.connect();
           InputStream stream = conn.getInputStream();
           conn.disconnect();
           return stream;
           return conn.getInputStream();
+          }
         catch (IOException e)
+          {
-...
         if(info.mUpdateExtras) info.mExtrasStream = downloadJSON(info.mObjectShortName+"_extras.json");
         downloadee.jsonDownloaded();
         try
+          {
           if( info.mObjectStream!=null ) info.mObjectStream.close();
+          }
         catch(IOException ioe)
+          {
           android.util.Log.e("D", "failed to close object input stream");
+          }
         try
+          {
           if( info.mExtrasStream!=null ) info.mExtrasStream.close();
+          }
         catch(IOException ioe)
+          {
           android.util.Log.e("D", "failed to close extras input stream");
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////

         return type.getNumScramble();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void addDownloadedObject(String shortName, boolean icon, boolean object, boolean extras)
+        {
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public static void setMeshState(int ordinal, int state)

src/main/res/values-de/strings.xml
34	34	<string name="configuring">Konfigurieren…</string>
35	35	<string name="saveError">Fehler beim Speichern der Datei</string>
36	36	<string name="networkError">Netzwerkfehler</string>
	37	<string name="success">Erfolg</string>
37	38	<string name="view">Sehen</string>
38	39	<string name="level_full">Volles Scramble</string>
39	40

src/main/res/values-es/strings.xml
34	34	<string name="configuring">Configurando…</string>
35	35	<string name="saveError">Error al guardar el archivo</string>
36	36	<string name="networkError">Error de red</string>
	37	<string name="success">Éxito</string>
37	38	<string name="view">Ver</string>
38	39	<string name="level_full">Revuelto Completo</string>
39	40

src/main/res/values-fr/strings.xml
34	34	<string name="configuring">Configuration…</string>
35	35	<string name="saveError">Échec de l\'enregistrement du fichier</string>
36	36	<string name="networkError">Erreur réseau</string>
	37	<string name="success">Succès</string>
37	38	<string name="view">Regarder</string>
38	39	<string name="level_full">Brouillage Complet</string>
39	40

src/main/res/values-ja/strings.xml
34	34	<string name="configuring">構成…</string>
35	35	<string name="saveError">ファイルの保存に失敗しました</string>
36	36	<string name="networkError">ネットワークエラー</string>
	37	<string name="success">成功</string>
37	38	<string name="view">見る</string>
38	39	<string name="level_full">フルスクランブル</string>
39	40

src/main/res/values-ko/strings.xml
34	34	<string name="configuring">구성…</string>
35	35	<string name="saveError">파일 저장 실패</string>
36	36	<string name="networkError">네트워크 오류</string>
	37	<string name="success">성공</string>
37	38	<string name="view">보다</string>
38	39	<string name="level_full">풀 스크램블</string>
39	40

src/main/res/values-pl/strings.xml
34	34	<string name="configuring">Konfigurowanie…</string>
35	35	<string name="saveError">Błąd zapisu pliku</string>
36	36	<string name="networkError">Błąd sieci</string>
	37	<string name="success">Sukces</string>
37	38	<string name="view">Zobacz</string>
38	39	<string name="level_full">Pełne Pomieszanie</string>
39	40

src/main/res/values-ru/strings.xml
34	34	<string name="configuring">Настройка…</string>
35	35	<string name="saveError">Не удалось сохранить файл</string>
36	36	<string name="networkError">Ошибка сети</string>
	37	<string name="success">Успех</string>
37	38	<string name="view">Смотри</string>
38	39	<string name="level_full">Полная Схватка</string>
39	40

src/main/res/values-zh-rCN/strings.xml
34	34	<string name="configuring">配置…</string>
35	35	<string name="saveError">保存文件失败</string>
36	36	<string name="networkError">網絡錯誤</string>
	37	<string name="success">成功</string>
37	38	<string name="view">看</string>
38	39	<string name="level_full">级满</string>
39	40

src/main/res/values-zh-rTW/strings.xml
34	34	<string name="configuring">配置…</string>
35	35	<string name="saveError">保存文件失敗</string>
36	36	<string name="networkError">網絡錯誤</string>
	37	<string name="success">成功</string>
37	38	<string name="view">看</string>
38	39	<string name="level_full">級滿</string>
39	40

src/main/res/values/strings.xml
35	35	<string name="configuring">Configuring…</string>
36	36	<string name="saveError">Failed to save file</string>
37	37	<string name="networkError">Network Error</string>
	38	<string name="success">Success</string>
38	39	<string name="view">View</string>
39	40	<string name="level_full">Full Scramble</string>
40	41

Project

General

Profile

Magic Cube

Revision 806329e3

Added by Leszek Koltunski over 2 years ago