Icone

app/src/main/java/app/fedilab/mobilizon/MainActivity.java

@@ -21,7 +21,6 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
-import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
@@ -78,8 +77,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     };
     private RelativeLayout progress;
     private WebView main_webview;
-    private TextView progressText;
+    private FrameLayout webview_container;
-    private  FrameLayout webview_container;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -115,7 +113,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         main_webview = findViewById(R.id.main_webview);
 
         progress = findViewById(R.id.progress);
-        progressText = findViewById(R.id.progressText);
         webview_container = findViewById(R.id.webview_container);
         final ViewGroup videoLayout = findViewById(R.id.videoLayout);
         String instance = Helper.getLiveInstance(MainActivity.this);
@@ -188,11 +185,6 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         }
     }
 
-    public void setProgressDialog(int progress) {
-        if (progressText != null) {
-            progressText.setText(String.format("%s%%", progress));
-        }
-    }
 
     @Override
     public void onBackPressed() {
@@ -217,10 +209,20 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
         } else if (id == R.id.nav_login) {
             main_webview.loadUrl("https://" + Helper.getLiveInstance(MainActivity.this) + "/login");
         } else if (id == R.id.nav_logout) {
-            Helper.clearCookies(MainActivity.this);
+            Helper.clearCookies();
-            isAuthenticated = false;
+            new java.util.Timer().schedule(
-            drawMenu();
+                    new java.util.TimerTask() {
-            main_webview.loadUrl("https://" + Helper.getLiveInstance(MainActivity.this));
+                        @Override
+                        public void run() {
+                            runOnUiThread(() -> {
+                                isAuthenticated = false;
+                                drawMenu();
+                                main_webview.loadUrl("https://" + Helper.getLiveInstance(MainActivity.this));
+                            });
+                        }
+                    },
+                    1000
+            );
         } else if (id == R.id.nav_profile) {
             main_webview.loadUrl("https://" + Helper.getLiveInstance(MainActivity.this) + "/identity/update");
         } else if (id == R.id.nav_register) {
@@ -257,7 +259,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
                             runOnUiThread(() -> {
                                 dialog.dismiss();
                                 main_webview.clearHistory();
-                                main_webview.loadUrl("https://" + instance);
+                                main_webview.loadUrl("https://" + newInstance);
                             });
                         } else {
                             runOnUiThread(() -> Toasty.error(MainActivity.this, getString(R.string.not_valide_instance), Toast.LENGTH_LONG).show());
@@ -345,7 +347,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
             navigationView.getMenu().findItem(R.id.nav_logout).setVisible(false);
             navigationView.getMenu().findItem(R.id.nav_register).setVisible(true);
         }
-        navigationView.invalidate();
+        //navigationView.invalidate();
     }
 
 }

app/src/main/java/app/fedilab/mobilizon/helper/Helper.java

@@ -5,10 +5,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.graphics.Color;
-import android.os.Build;
 import android.util.Base64;
 import android.webkit.CookieManager;
-import android.webkit.CookieSyncManager;
 import android.webkit.WebSettings;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
@@ -105,20 +103,10 @@ public class Helper {
         }
     }
 
-    public static void clearCookies(Context context) {
+    public static void clearCookies() {
         WebStorage.getInstance().deleteAllData();
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+        CookieManager.getInstance().removeAllCookies(null);
-            CookieManager.getInstance().removeAllCookies(null);
+        CookieManager.getInstance().flush();
-            CookieManager.getInstance().flush();
-        } else {
-            CookieSyncManager cookieSyncMngr = CookieSyncManager.createInstance(context);
-            cookieSyncMngr.startSync();
-            CookieManager cookieManager = CookieManager.getInstance();
-            cookieManager.removeAllCookie();
-            cookieManager.removeSessionCookie();
-            cookieSyncMngr.stopSync();
-            cookieSyncMngr.sync();
-        }
     }
 
 }

app/src/main/java/app/fedilab/mobilizon/webview/MobilizonWebChromeClient.java

@@ -78,7 +78,6 @@ public class MobilizonWebChromeClient extends WebChromeClient implements MediaPl
     @Override
     public void onProgressChanged(WebView view, int newProgress) {
         super.onProgressChanged(view, newProgress);
-        ((MainActivity) activity).setProgressDialog(newProgress);
     }
 
     @Override

app/src/main/java/app/fedilab/mobilizon/webview/MobilizonWebViewClient.java

@@ -13,10 +13,10 @@ package app.fedilab.mobilizon.webview;
  *
  * You should have received a copy of the GNU General Public License along with Mobilizon app; if not,
  * see <http://www.gnu.org/licenses>. */
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -46,7 +46,7 @@ public class MobilizonWebViewClient extends WebViewClient {
     private Activity activity;
     private CoordinatorLayout rootView;
 
-    public MobilizonWebViewClient(Activity activity){
+    public MobilizonWebViewClient(Activity activity) {
         this.activity = activity;
         rootView = activity.findViewById(R.id.main_layout);
     }
@@ -58,16 +58,26 @@ public class MobilizonWebViewClient extends WebViewClient {
     }
 
 
-
     @Override
     public WebResourceResponse shouldInterceptRequest(final WebView view, WebResourceRequest request) {
-        if(request.getUrl().toString().endsWith("api")){
+
+        if (request.getUrl().toString().endsWith("api")) {
             Map<String, String> headers = request.getRequestHeaders();
             Iterator<Map.Entry<String, String>> it = headers.entrySet().iterator();
             while (it.hasNext()) {
                 Map.Entry<String, String> pair = it.next();
-                if( pair.getKey().compareTo("authorization") == 0 && pair.getValue().startsWith("Bearer")) {
+                if (pair.getKey().compareTo("authorization") == 0) {
-                    MainActivity.isAuthenticated = true;
+                    if (pair.getValue().startsWith("Bearer")) {
+                        if (!MainActivity.isAuthenticated) {
+                            MainActivity.isAuthenticated = true;
+                            activity.runOnUiThread(() -> ((MainActivity) activity).drawMenu());
+                        }
+                    } else {
+                        if (MainActivity.isAuthenticated) {
+                            MainActivity.isAuthenticated = false;
+                            activity.runOnUiThread(() -> ((MainActivity) activity).drawMenu());
+                        }
+                    }
                 }
                 it.remove();
             }
@@ -143,8 +153,7 @@ public class MobilizonWebViewClient extends WebViewClient {
     @Override
     public void onPageFinished(WebView view, String url) {
         Helper.injectCSS(activity, view, "css/style.css");
-        ((MainActivity)activity).hideProgressDialog();
+        ((MainActivity) activity).hideProgressDialog();
-        ((MainActivity)activity).drawMenu();
         view.setVisibility(View.VISIBLE);
     }
 }

app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

app/src/main/res/layout/content_main.xml

@@ -41,13 +41,6 @@
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              />
-         <TextView
-             app:layout_constraintTop_toBottomOf="@+id/progressBar"
-             app:layout_constraintStart_toStartOf="parent"
-             app:layout_constraintEnd_toEndOf="parent"
-             android:layout_width="wrap_content"
-             android:id="@+id/progressText"
-             android:layout_height="wrap_content"/>
       </androidx.constraintlayout.widget.ConstraintLayout>
    </RelativeLayout>
 

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
+    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/colors.xml

@@ -2,5 +2,5 @@
 <resources>
     <color name="colorPrimary">#474467</color>
     <color name="colorPrimaryDark">#ffd599</color>
-    <color name="colorAccent">#1e7d97</color>
+    <color name="colorAccent">#1E7D97</color>
 </resources>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FEA72B</color>
+</resources>