/ - Diff - Magic Cube - Distorted Android

« Previous | Next »

Revision ffe7e55d

Added by Leszek Koltunski almost 3 years ago

ID ffe7e55d51ebe175a8aa253af511da5802e80ec8
Parent 9fde123a
Child b88cdd91

Reorganize the Network so that concurrent network operattions are possible.
Finally figure out and fix the bug which was causing users to multi-submit the same records over and over.

src/main/java/org/distorted/dialogs/RubikDialogUpdates.java
177	177	View pane = rubikView.createView(act,info,mFontSize,mPadding,pI,pV,pT,pB);
178	178	mLayout.addView(pane);
179	179	}
	180
	181	RubikNetwork network = RubikNetwork.getInstance();
	182	network.downloadIcons(this);
180	183	}
181	184	else
182	185	{
...	...
211	214	mText.setText("Network error");
212	215	}
213	216
	217	///////////////////////////////////////////////////////////////////////////////////////////////////
	218
	219	public void iconDownloaded()
	220	{
	221
	222	}
	223
214	224	///////////////////////////////////////////////////////////////////////////////////////////////////
215	225
216	226	public static String getDialogTag()

             long elapsed = timeNow - startTime;
             String suspicious ="start"+startTime+"end"+endTime+"elapsed"+elapsed+"obj"+objName+"level"+level+"record"+mNewRecord+"scrambles"+scrambleNum+debug;
             RubikNetwork network = RubikNetwork.getInstance();
             network.suspicious(act,suspicious);
             network.suspicious(suspicious);
+            }
           FirebaseAnalytics analytics = act.getAnalytics();

src/main/java/org/distorted/main/RubikRenderer.java
140	140	{
141	141	mDebugSent= true;
142	142	RubikNetwork network = RubikNetwork.getInstance();
143		network.debug( (RubikActivity)mView.getContext());
	143	network.debug();
144	144	}
145	145	}
146	146

     import java.security.MessageDigest;
     import java.security.NoSuchAlgorithmException;
     import android.app.Activity;
     import android.content.pm.PackageInfo;
     import android.content.pm.PackageManager;
     import androidx.appcompat.app.AppCompatActivity;
     import androidx.fragment.app.FragmentActivity;
     import org.distorted.library.main.DistortedLibrary;
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
     public class RubikNetwork implements Runnable
     public class RubikNetwork
+      {
       public interface Receiver
+        {
-...
       public interface Updatee
+        {
         void iconDownloaded();
         void receiveUpdate(RubikUpdates update);
         void errorUpdate();
+        }
       public static final int MAX_PLACES = 10;
       private static final int DOWNLOAD   = 0;
       private static final int SUBMIT     = 1;
       private static final int DEBUG      = 2;
       private static final int SUSPICIOUS = 3;
       private static final int IDLE       = 4;
       private static final int REND_ADRENO= 0;
       private static final int REND_MALI  = 1;
       private static final int REND_POWER = 2;
       private static final int REND_OTHER = 3;
       private static final int DEBUG_NOT_YET = 0;
       private static final int DEBUG_RUNNING = 1;
       private static final int DEBUG_SUCCESS = 2;
       private static final int DEBUG_FAILURE = 3;
-...
       private static RubikNetwork mThis;
       private static String mScores = "";
       private static boolean mRunning = false;
       private static int mMode = IDLE;
       private static Receiver mReceiver;
       private static Updatee mUpdatee;
       private static String mVersion;
-...
         return sbuf.toString();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void sendDebug()
+        {
         String url = constructDebugURL();
     /*
         try { Thread.sleep(5000); }
         catch( InterruptedException ignored) {}
     */
         try
+          {
           java.net.URL connectURL = new URL(url);
           HttpURLConnection conn = (HttpURLConnection)connectURL.openConnection();
           conn.setDoInput(true);
           conn.setDoOutput(true);
           conn.setUseCaches(false);
           conn.setRequestMethod("GET");
           conn.connect();
           conn.getOutputStream().flush();
           InputStream is = conn.getInputStream();
           BufferedReader r = new BufferedReader(new InputStreamReader(is));
           StringBuilder answer = new StringBuilder();
           for (String line; (line = r.readLine()) != null; )
+            {
             answer.append(line).append('\n');
+            }
           String updates = answer.toString();
           mUpdates.parse(updates);
           if( mUpdatee!=null ) mUpdatee.receiveUpdate(mUpdates);
           mDebugState = DEBUG_SUCCESS;
+          }
         catch( final Exception e )
+          {
           if( mUpdatee!=null ) mUpdatee.errorUpdate();
           mDebugState = DEBUG_FAILURE;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void sendSuspicious()
+        {
         String url = constructSuspiciousURL();
         try
+          {
           java.net.URL connectURL = new URL(url);
           HttpURLConnection conn = (HttpURLConnection)connectURL.openConnection();
           conn.setDoInput(true);
           conn.setDoOutput(true);
           conn.setUseCaches(false);
           conn.setRequestMethod("GET");
           conn.connect();
           conn.getOutputStream().flush();
           conn.getInputStream();
+          }
         catch( final Exception e )
+          {
           // ignore
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private boolean network(String url)
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       @Override
       public void run()
       private void figureOutVersion(FragmentActivity act)
+        {
         boolean receiveValues=true;
         try
+          {
           PackageInfo pInfo = act.getPackageManager().getPackageInfo( act.getPackageName(), 0);
           mVersion = pInfo.versionName;
+          }
         catch (PackageManager.NameNotFoundException e)
+          {
           mVersion = "0.9.2";
+          }
+        }
         initializeStatics();
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void downloadThread()
+        {
         try
+          {
           if( mMode==DOWNLOAD && gottaDownload() )
+            {
             mRunning = true;
             receiveValues = network(constructDownloadURL());
+            }
           if( mMode==SUBMIT )
           if( gottaDownload() )
+            {
             mRunning = true;
             RubikScores scores = RubikScores.getInstance();
             boolean receiveValues = network(constructDownloadURL());
             if( scores.thereAreUnsubmittedRecords() )
             if( mRunning )
+              {
               receiveValues = network(constructSubmitURL());
               receiveValues = fillValuesNormal();
               mRunning = false;
+              }
+            }
           if( mMode==DEBUG )
+            {
             sendDebug();
             receiveValues = false;
             mRunning = false;
+            }
           if( mMode==SUSPICIOUS )
+            {
             sendSuspicious();
             receiveValues = false;
             mRunning = false;
             if( receiveValues && mReceiver!=null ) mReceiver.receive(mCountry, mName, mTime);
+            }
+          }
         catch( Exception e )
+          {
           android.util.Log.e("D", "Exception in RUN");
           if( mReceiver!=null ) mReceiver.message("Exception downloading records: "+e.getMessage() );
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         if( mRunning )
       private void submitThread()
+        {
         try
+          {
           mRunning = true;
           RubikScores scores = RubikScores.getInstance();
           if( scores.thereAreUnsubmittedRecords() )
+            {
             boolean receiveValues = network(constructSubmitURL());
             if( mRunning )
+              {
               receiveValues = fillValuesNormal();
               mRunning = false;
+              }
             if( receiveValues )
+              {
               RubikScores.getInstance().successfulSubmit();
               if( mReceiver!=null ) mReceiver.receive(mCountry, mName, mTime);
+              }
+            }
+          }
         catch( Exception e )
+          {
           receiveValues = fillValuesNormal();
           mRunning = false;
           if( mReceiver!=null ) mReceiver.message("Exception submitting records: "+e.getMessage() );
+          }
+        }
         if( receiveValues )
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void debugThread()
+        {
         String url = constructDebugURL();
     /*
         try { Thread.sleep(5000); }
         catch( InterruptedException ignored) {}
     */
         try
+          {
           if( mReceiver!=null ) mReceiver.receive(mCountry, mName, mTime);
           java.net.URL connectURL = new URL(url);
           HttpURLConnection conn = (HttpURLConnection)connectURL.openConnection();
           if( mMode==SUBMIT )
           conn.setDoInput(true);
           conn.setDoOutput(true);
           conn.setUseCaches(false);
           conn.setRequestMethod("GET");
           conn.connect();
           conn.getOutputStream().flush();
           InputStream is = conn.getInputStream();
           BufferedReader r = new BufferedReader(new InputStreamReader(is));
           StringBuilder answer = new StringBuilder();
           for (String line; (line = r.readLine()) != null; )
+            {
             RubikScores.getInstance().successfulSubmit();
             answer.append(line).append('\n');
+            }
           String updates = answer.toString();
           mUpdates.parse(updates);
           if( mUpdatee!=null ) mUpdatee.receiveUpdate(mUpdates);
           mDebugState = DEBUG_SUCCESS;
+          }
         catch( final Exception e )
+          {
           if( mUpdatee!=null ) mUpdatee.errorUpdate();
           mDebugState = DEBUG_FAILURE;
+          }
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void suspiciousThread()
+        {
         String url = constructSuspiciousURL();
         try
+          {
           java.net.URL connectURL = new URL(url);
           HttpURLConnection conn = (HttpURLConnection)connectURL.openConnection();
           conn.setDoInput(true);
           conn.setDoOutput(true);
           conn.setUseCaches(false);
           conn.setRequestMethod("GET");
           conn.connect();
           conn.getOutputStream().flush();
           conn.getInputStream();
+          }
         catch( final Exception e )
+          {
           // ignore
+          }
+        }
-...
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       private void start(Receiver receiver, Activity act, int mode)
       public void download(Receiver receiver, FragmentActivity act)
+        {
         initializeStatics();
         mReceiver = receiver;
         mMode     = mode;
         figureOutVersion(act);
         try
         Thread thread = new Thread()
+          {
           PackageInfo pInfo = act.getPackageManager().getPackageInfo( act.getPackageName(), 0);
           mVersion = pInfo.versionName;
+          }
         catch (PackageManager.NameNotFoundException e)
+          {
           mVersion = "0.9.2";
+          }
           public void run()
+            {
             downloadThread();
+            }
           };
         Thread networkThrd = new Thread(this);
         networkThrd.start();
         thread.start();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void download(Receiver receiver, FragmentActivity act)
       public void submit(Receiver receiver, FragmentActivity act)
+        {
         start(receiver, act, DOWNLOAD);
+        }
         initializeStatics();
         mReceiver = receiver;
         figureOutVersion(act);
     ///////////////////////////////////////////////////////////////////////////////////////////////////
         Thread thread = new Thread()
+          {
           public void run()
+            {
             submitThread();
+            }
           };
       public void submit(Receiver receiver, FragmentActivity act)
+        {
         start(receiver, act, SUBMIT);
         thread.start();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void debug(AppCompatActivity act)
       public void debug()
+        {
         initializeStatics();
         mDebugState = DEBUG_RUNNING;
         start(null, act, DEBUG);
         Thread thread = new Thread()
+          {
           public void run()
+            {
             debugThread();
+            }
           };
         thread.start();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void suspicious(AppCompatActivity act, String suspicious)
       public void suspicious(String suspicious)
+        {
         initializeStatics();
         mSuspicious = suspicious;
         start(null, act, SUSPICIOUS);
         Thread thread = new Thread()
+          {
           public void run()
+            {
             suspiciousThread();
+            }
           };
         thread.start();
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
-...
         else mUpdatee = updatee;
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void downloadIcons(Updatee updatee)
+        {
+        }
     ///////////////////////////////////////////////////////////////////////////////////////////////////
       public void updateDone(String shortName)

src/main/java/org/distorted/screens/RubikScreenPlay.java
710	710
711	711	public void receiveUpdate(RubikUpdates updates)
712	712	{
713		updates.showDebug();
714
715	713	Activity act = mWeakAct.get();
716	714
717	715	if( act!=null )
...	...
746	744	{
747	745	android.util.Log.e("D", "Screen: Error receiving update");
748	746	}
	747
	748	///////////////////////////////////////////////////////////////////////////////////////////////////
	749
	750	public void iconDownloaded()
	751	{
	752	// empty
	753	}
749	754	}

Also available in: Unified diff

Project

General

Profile

Magic Cube

Revision ffe7e55d

Added by Leszek Koltunski almost 3 years ago