Project

General

Profile

« Previous | Next » 

Revision 1ae7c033

Added by Leszek Koltunski about 19 hours ago

Bugfix: make it possible to download tutorials for an object later.

View differences:

src/main/java/org/distorted/dialogs/DialogUpdateView.java
229 229 
            if( success )
230 230 
              {
231 231 
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "2");
232 

  		




  233
  232
  
    
              RubikNetwork network = RubikNetwork.getInstance();


  		




  234
  233
  
    
              network.updateDone(mInfo.mObjectShortName);


  		




  235
  
  
    

  		




  236
  234
  
    
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "3");


  		




  237
  
  
    

  		




  238
  235
  
    
              makeProgress(100,R.string.success);


  		




  239
  
  
    

  		




  240
  236
  
    
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "4");


  		




  241
  237
  
    
              }


  		




  242
  238
  
    
            else


  		




  ......




  256
  252
  
    
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Error reading numScrambles");


  		




  257
  253
  
    
          }


  		




  258
  254
  
    
        }


  		




  
  255
  
    
      else


  		




  
  256
  
    
        {


  		




  
  257
  
    
        if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Read from JSON numScrambles="+mInfo.mNumScrambles+" price="+mInfo.mPrice);


  		




  
  258
  
    

  		




  
  259
  
    
        if( mInfo.mExtrasStream!=null )


  		




  
  260
  
    
          {


  		




  
  261
  
    
          Activity act = mAct.get();


  		




  
  262
  
    
          String name = mInfo.mObjectShortName + "_extras.json";


  		




  
  263
  
    
          eSuccess = files.saveFile(act,mInfo.mExtrasStream, name);


  		




  
  264
  
    
          if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Saving Extras "+name+" to a file "+eSuccess);


  		




  
  265
  
    
          makeProgress(75,R.string.configuring);


  		




  
  266
  
    

  		




  
  267
  
    
          if( eSuccess )


  		




  
  268
  
    
            {


  		




  
  269
  
    
            if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "1a");


  		




  
  270
  
    

  		




  
  271
  
    
            boolean success = RubikObjectList.addDownloadedExtras(mInfo.mObjectShortName, mInfo.mExtrasMinorVersion);


  		




  
  272
  
    
            if( success )


  		




  
  273
  
    
              {


  		




  
  274
  
    
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "2a");


  		




  
  275
  
    
              RubikNetwork network = RubikNetwork.getInstance();


  		




  
  276
  
    
              network.updateDone(mInfo.mObjectShortName);


  		




  
  277
  
    
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "3a");


  		




  
  278
  
    
              makeProgress(100,R.string.success);


  		




  
  279
  
    
              if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "4a");


  		




  
  280
  
    
              }


  		




  
  281
  
    
            else


  		




  
  282
  
    
              {


  		




  
  283
  
    
              displayError(R.string.saveError);


  		




  
  284
  
    
              }


  		




  
  285
  
    
            }


  		




  
  286
  
    
          else


  		




  
  287
  
    
            {


  		




  
  288
  
    
            displayError(R.string.saveError);


  		




  
  289
  
    
            }


  		




  
  290
  
    
          }


  		




  
  291
  
    
        else


  		




  
  292
  
    
          {


  		




  
  293
  
    
          makeProgress(100,R.string.tutorialsError);


  		




  
  294
  
    
          RubikNetwork network = RubikNetwork.getInstance();


  		




  
  295
  
    
          network.updateDone(mInfo.mObjectShortName);


  		




  
  296
  
    
          }


  		




  
  297
  
    
        }


  		




  259
  298
  
    
      }


  		




  260
  299
  
    
    }


  		




  261
  300
  
    
  }


  		












  

    
      src/main/java/org/distorted/objects/RubikObject.java
    
  





  256
  256
  
    
  public void markFree()                    { mIsFree=true; }


  		




  257
  257
  
    
  public int getObjectVersion()             { return mObjectVersion; }


  		




  258
  258
  
    
  public int getExtrasVersion()             { return mExtrasVersion; }


  		




  
  259
  
    
  public void setExtrasVersion(int version) { mExtrasVersion = version; mExtrasID= -1; }


  		




  259
  260
  
    
  public void setExtrasOrdinal(int ordinal) { mExtrasOrdinal = ordinal; }


  		




  260
  261
  
    
  public int getExtrasOrdinal()             { return mExtrasOrdinal; }


  		




  261
  262
  
    
  public boolean supportsAdjustableColors() { return mAdjColors; }


  		












  

    
      src/main/java/org/distorted/objects/RubikObjectList.java
    
  





  240
  240
  
    
      }


  		




  241
  241
  
    
    }


  		




  242
  242
  
    

  		




  
  243
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  
  244
  
    

  		




  
  245
  
    
  public static boolean addDownloadedExtras(String shortName, int extrasVersion)


  		




  
  246
  
    
    {


  		




  
  247
  
    
    if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "New downloaded extras for "+shortName);


  		




  
  248
  
    

  		




  
  249
  
    
    for( RubikObject obj : mObjects )


  		




  
  250
  
    
      {


  		




  
  251
  
    
      if( obj.getLowerName().equals(shortName) )


  		




  
  252
  
    
        {


  		




  
  253
  
    
        obj.setExtrasOrdinal(mNumExtras);


  		




  
  254
  
    
        obj.setExtrasVersion(extrasVersion);


  		




  
  255
  
    
        mNumExtras++;


  		




  
  256
  
    

  		




  
  257
  
    
        if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Downloaded object "+shortName+" now has extras");


  		




  
  258
  
    
        return true;


  		




  
  259
  
    
        }


  		




  
  260
  
    
      }


  		




  
  261
  
    
    return false;


  		




  
  262
  
    
    }


  		




  
  263
  
    

  		




  243
  264
  
    
///////////////////////////////////////////////////////////////////////////////////////////////////


  		




  244
  265
  
    

  		




  245
  266
  
    
  public static boolean thereAreLockedObjects()


  		












  

    
      src/main/res/values-de/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">Konfigurieren…</string>


  		




  34
  34
  
    
    <string name="solving">Lösen…</string>


  		




  35
  35
  
    
    <string name="saveError">Fehler beim Speichern der Datei</string>


  		




  
  36
  
    
    <string name="tutorialsError">Tutorials nicht gefunden</string>


  		




  36
  37
  
    
    <string name="networkError">Netzwerkfehler</string>


  		




  37
  38
  
    
    <string name="success">Erfolg</string>


  		




  38
  39
  
    
    <string name="view">Sehen</string>


  		












  

    
      src/main/res/values-es/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">Configurando…</string>


  		




  34
  34
  
    
    <string name="solving">Resolviendo…</string>


  		




  35
  35
  
    
    <string name="saveError">Error al guardar el archivo</string>


  		




  
  36
  
    
    <string name="tutorialsError">No se encontraron tutoriales</string>


  		




  36
  37
  
    
    <string name="networkError">Error de red</string>


  		




  37
  38
  
    
    <string name="success">Éxito</string>


  		




  38
  39
  
    
    <string name="view">Ver</string>


  		












  

    
      src/main/res/values-fr/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">Configuration…</string>


  		




  34
  34
  
    
    <string name="solving">Résoudre…</string>


  		




  35
  35
  
    
    <string name="saveError">Échec de l\'enregistrement du fichier</string>


  		




  
  36
  
    
    <string name="tutorialsError">Tutoriels non trouvés</string>


  		




  36
  37
  
    
    <string name="networkError">Erreur réseau</string>


  		




  37
  38
  
    
    <string name="success">Succès</string>


  		




  38
  39
  
    
    <string name="view">Regarder</string>


  		












  

    
      src/main/res/values-ja/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">構成…</string>


  		




  34
  34
  
    
    <string name="solving">解決中…</string>


  		




  35
  35
  
    
    <string name="saveError">ファイルの保存に失敗しました</string>


  		




  
  36
  
    
    <string name="tutorialsError">チュートリアルが見つかりません</string>


  		




  36
  37
  
    
    <string name="networkError">ネットワークエラー</string>


  		




  37
  38
  
    
    <string name="success">成功</string>


  		




  38
  39
  
    
    <string name="view">見る</string>


  		












  

    
      src/main/res/values-ko/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">구성…</string>


  		




  34
  34
  
    
    <string name="solving">해결 중…</string>


  		




  35
  35
  
    
    <string name="saveError">파일 저장 실패</string>


  		




  
  36
  
    
    <string name="tutorialsError">튜토리얼을 찾을 수 없습니다</string>


  		




  36
  37
  
    
    <string name="networkError">네트워크 오류</string>


  		




  37
  38
  
    
    <string name="success">성공</string>


  		




  38
  39
  
    
    <string name="view">보다</string>


  		












  

    
      src/main/res/values-pl/strings.xml
    
  





  33
  33
  
    
    <string name="solving">Rozwiązywanie…</string>


  		




  34
  34
  
    
    <string name="configuring">Konfigurowanie…</string>


  		




  35
  35
  
    
    <string name="saveError">Błąd zapisu pliku</string>


  		




  
  36
  
    
    <string name="tutorialsError">Tutoriale nie znalezione</string>


  		




  36
  37
  
    
    <string name="networkError">Błąd sieci</string>


  		




  37
  38
  
    
    <string name="success">Sukces</string>


  		




  38
  39
  
    
    <string name="view">Zobacz</string>


  		












  

    
      src/main/res/values-ru/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">Настройка…</string>


  		




  34
  34
  
    
    <string name="solving">Решение…</string>


  		




  35
  35
  
    
    <string name="saveError">Не удалось сохранить файл</string>


  		




  
  36
  
    
    <string name="tutorialsError">Учебники не найдены</string>


  		




  36
  37
  
    
    <string name="networkError">Ошибка сети</string>


  		




  37
  38
  
    
    <string name="success">Успех</string>


  		




  38
  39
  
    
    <string name="view">Смотри</string>


  		












  

    
      src/main/res/values-zh-rCN/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">配置…</string>


  		




  34
  34
  
    
    <string name="solving">正在解决…</string>


  		




  35
  35
  
    
    <string name="saveError">保存文件失败</string>


  		




  
  36
  
    
    <string name="tutorialsError">未找到教程</string>


  		




  36
  37
  
    
    <string name="networkError">網絡錯誤</string>


  		




  37
  38
  
    
    <string name="success">成功</string>


  		




  38
  39
  
    
    <string name="view">看</string>


  		












  

    
      src/main/res/values-zh-rTW/strings.xml
    
  





  33
  33
  
    
    <string name="configuring">配置…</string>


  		




  34
  34
  
    
    <string name="solving">解決…</string>


  		




  35
  35
  
    
    <string name="saveError">保存文件失敗</string>


  		




  
  36
  
    
    <string name="tutorialsError">未找到教程</string>


  		




  36
  37
  
    
    <string name="networkError">網絡錯誤</string>


  		




  37
  38
  
    
    <string name="success">成功</string>


  		




  38
  39
  
    
    <string name="view">看</string>


  		












  

    
      src/main/res/values/strings.xml
    
  





  35
  35
  
    
    <string name="configuring">Configuring…</string>


  		




  36
  36
  
    
    <string name="solving">Solving…</string>


  		




  37
  37
  
    
    <string name="saveError">Failed to save file</string>


  		




  
  38
  
    
    <string name="tutorialsError">Tutorials not found</string>


  		




  38
  39
  
    
    <string name="networkError">Network Error</string>


  		




  39
  40
  
    
    <string name="success">Success</string>


  		




  40
  41
  
    
    <string name="view">View</string>


  		












Also available in:  Unified diff